- Minor changes
Merge branch 'master' of https://github.com/InfusionRaleighEvent/more_cowbell

Conflicts:
	TechJam/Scripts/doctor.js