Removed database.yml
Switch from SQLite to PostgreSQL
Merge branch 'master' of https://github.com/joffwilliams/sample_app

Conflicts:
	config/database.yml