Commit nitrous
Merge branch 'master' of https://github.com/odraude7/vader

Conflicts:
	Gemfile
	config/database.yml