added firebase integration
fixing merge conflicts
Merge branch 'master' of https://github.com/andreking/trippin
merging branches