add database.yml to gitignore, >= in gemfile
Merge branch 'master' of https://github.com/avoorhis/vamps_rails_app

Conflicts:
	Gemfile.lock