Working on layout
Merge branch 'master' into login
Merge branch 'master' into login
merging from master
fixed merge conflicts
Merge pull request #17 from Mikedgs/login

Login