Don't track /bin and /gen. Fix results (again).
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battleships-android/bin/classes.dex
	Battleships-android/bin/classes/com/me/Battleships/MainActivity.class
	Battleships-android/bin/resources.ap_
	Battleships-android/project.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battleships-android/bin/classes.dex
	Battleships-android/bin/classes/com/me/Battleships/MainActivity.class
	Battleships-android/bin/resources.ap_