Initial commit

Plain Rails app with PostgreSQL
Merge branch 'master' of github.com:BanzaiMan/travis-intro

Conflicts:
	.gitignore