changed counter
Merge branch 'master' into User
Fixed merge conflict
Done some of the Home page
fixed merge conflict
Merge pull request #11 from Mikedgs/User

User