firebase working-ish, did not change prototype.html
Merge branch 'master' of https://github.com/chrisying/pulsr

Had to merge some changed code