BS commit (git error), will revert
Merge branch 'master' of https://github.com/amyfan/Coacheller

Conflicts:
	Coacheller-AppEngine/shared/com/ratethisfest/data/FestData.java