generate demo database
Put it on heroku
Merge branch 'master' of https://github.com/YangShi2013/IE

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/users.css.scss
	app/controllers/users_controller.rb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/initializers/secret_token.rb
	db/schema.rb
add basic database
Merge branch 'master' of https://github.com/YangShi2013/IE

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.json.jbuilder
	app/views/users/show.json.jbuilder
	db/schema.rb