Merge pull request #2 from sandBoxMasters/master

https://scorching-fire-5198.firebaseapp.com/