Here it go
Merge branch 'master' of https://github.com/AndrewAskins/BoardDog

Conflicts:
	app/scripts/schedule/ScheduleCtrl.js