testing heroku
schweet schweet victory
quick commit before merging in Phil's stuff.
I think this fixes our merge conflicts.
merging