Created users
Added microposts
Updating everything
Merge branch 'master' of github.com:anonorion/demo_app

Conflicts:
	README.md