cant wait for the best merge conflict ever
Merge pull request #14 from waneka/firebase

cant wait for the best merge conflict ever