Changed a couple of things in users.php added some more tests
Fixed timestamp to use correct db model
Merge branch 'master' of https://github.com/freshcelery/10_hero_challenge

Conflicts:
	index.php