gemfile change
Merge branch 'master' of https://github.com/vivecamorris/warrior_scholar into unicorn_pull
added config/database to .gitignore
unicorn won't run on windows
'k'
new relic gem