merging with mike
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge

Conflicts:
	js/controllers/GTSController.js
	partials/gts.html
took off merge error