Merge branch 'add_db'

Conflicts:
	app/controllers/demo_controller.rb
change gitignore
resolve conflict
Merge branch 'master' into crud