OCRAD
test
commit
texting
merge
merging
firebaseAPI
firebaseapi
heroku puh
it worksgit add --all .
wat
testing heroku
schweet schweet victory
quick commit before merging in Phil's stuff.
I think this fixes our merge conflicts.