OCRAD
test
commit
texting
merge
merging
firebaseAPI
firebaseapi
heroku puh
it worksgit add --all .
wat
I think this fixes our merge conflicts.