Merge remote-tracking branch 'CodyHoward/master'
Working in Controllers
doing work on create course
Merge remote-tracking branch 'CodyHoward/master'
merging with cody
fixing up little things
Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java