testing git again
added event popup to events calendar page
added initial login screen
Merge branch 'master' of https://github.com/mjones2930/TheSocialApp
git messed up
Merge branch 'master' of https://github.com/mjones2930/TheSocialApp
Merge branch 'master' of https://github.com/mjones2930/TheSocialApp
added name to test git