Change
Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_20_0_0.xml
	build/intermediates/dex-cache/cache.xml
Added the ability to do pushes!