recommitting working version
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge

Conflicts:
	js/controllers/LoginController.js