postgresql as db
Scaffold User
Scaffold Micropost
Associate Users Microposts
Validate Micropost content <= 140
Show users name on Micropost Show
Merge branch 'master' of github.com:x13203/demo_app

Conflicts:
	config/database.yml