hey
com
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	bin/classes/com/example/examplee/MainActivity.class