everything should be fixed. still need to add sophana's tests back in
precompiled assets to help with heroku
added gems for heroku integration
master clone
Merge branch 'testtt'
couple hidden files updated
added sophana's testing work back to the master
merged with master for test
dev log modified trying to do tests
removed log file because of merge issue
merging with master
added the migration files
added stuff
merged with test stuff successfully with no errors
added the business model stuff that ryan did
added ryan's business model
Merge branch 'master' into cosimo