Working on layout
Merge branch 'master' into login
Merge branch 'master' into login
User index updated
Merge pull request #16 from Mikedgs/Mike_refactoring

User index updated
merging from master
fixed merge conflicts
Merge pull request #17 from Mikedgs/login

Login
Merge branch 'master' into User