pull latest commit from mike and merge what i currently have
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge

Conflicts:
	js/main.js