automatic deployment
Merge pull request #15 from conorfennell/master

automatic deployment