ajax login halfway
ajax login working, needs styling
pulled
merged, checked
Merge branch 'develop' of https://github.com/UCF-SoftwareEngineering-Team2/GameServe into develop

fast forward
Merge branch 'featTemplate' into develop

merge, login via pop up working