Did heroku and travis stuff. So basically edited minor things to make heroku and travis potentially work. Didn't add any tests or anything, but now we just have the capability
Merge remote-tracking branch 'origin/master'