Sync
Removing Conflicts

Conflicts:
	bin/classes/au/edu/act/ltc/MainActivity.class
Removing Conflicts