Edited login page
Merge branch 'master' of https://github.com/amwoods3/TeamO-PhotoBomb
Edited the welcome page