Finish demo app
Merge branch 'manish/my_app:1'

Conflicts:
	app/models/user.rb
	config/routes.rb
	db/schema.rb