Merge pull request #5 from jaythaceo/develop

Merge pull request #4 from jaythaceo/master
Merge pull request #6 from jaythaceo/develop

Develop
catching up
Fixed?
Ready to deploy
Finished