deleted extra source file that contained another gemfile, updated yml file to configure to postgress
removed sqlite3 from gemfile
set true on asset pipeline compile
Merge branch 'master' of https://github.com/red-spotted-newts-2014/FantasyFootballMockAwesomeness into deployment_2
Merge branch 'master' of https://github.com/red-spotted-newts-2014/FantasyFootballMockAwesomeness into deployment_2
set the static compile for asset to true for heroku
set the static compile for asset to true for heroku
Merge pull request #36 from cassiemoy/asset_compiler

Asset compiler
Merge pull request #37 from cassiemoy/master

Add SimpleCov to gemfile, etc.
Delete .DS_Store
Commit before pulling.
Fix merge conflict.