Anthony Cicchetti 3e296ad74f Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml		2018-11-30 14:16:41 -05:00
..
src	Merge remote-tracking branch 'origin/master'	2018-11-30 14:16:41 -05:00
.gitignore	Initial commit	2018-02-19 20:51:36 -05:00
build.gradle	Updated tests	2018-11-02 21:01:20 -04:00
gradle.properties	Updated a whole bunch of dependencies, nixed the support library	2018-11-02 12:59:45 -04:00
proguard-rules.pro	Initial commit	2018-02-19 20:51:36 -05:00