Last commit was botched and 1 file deleted for completely unknown reason
Should be fixed.
The real commit
No really
I mean it this time
Merge branch 'master' of https://github.com/amyfan/Coacheller

Conflicts:
	Coacheller-Android/src/com/coacheller/CoachellerApplication.java