commit
solarbug sync
Merge branch 'master' of https://github.com/goose1987/EE542

Conflicts:
	Solarbug/bin/classes/com/solarbug/MainActivity.class