Add spork
Merge branch 'master' of github.com:metafour/sample_app

delete database.yml