syncing
Merge branch 'master' of https://github.com/stephalee/challenge

Conflicts:
	WhyNot/bin/classes/com/example/whynot/MainActivity.class