Merge pull request #1 from shanethehat/develop

Add deployment
Merge branch 'master' into develop