Commiting gabe's changes??

I dont fucking know
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/Gradle__ComAndroidSupportAppcompatV71900_aar.xml
	.idea/misc.xml
	gradle/wrapper/gradle-wrapper.properties