everything should be fixed. still need to add sophana's tests back in
precompiled assets to help with heroku
added gems for heroku integration
Merge branch 'testtt'
couple hidden files updated
added sophana's testing work back to the master
merged with master for test