0.0.0
Merge branch 'master' into develop

Conflicts:
	config/initializers/version.rb
Fix database
Add welcome controller
Add test database to database.yml
Fix before_script in travis.yml to build database
Try rake command instaed of psql
Remove comment from travis.yml
Add production database and root route
Merge branch 'develop'