fixing the head error with git that showed up when merging
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge