changed user timestamp
edit user timestamp
Merge branch 'master' of https://github.com/hey-you-project/hey_you_api into dev_branch
Merge pull request #11 from hey-you-project/dev_branch

Dev branch
Merge pull request #12 from hey-you-project/test-paul

pulled out failing test
Update README.md
Merge pull request #13 from hey-you-project/dev_branch

Update README.md