Updated some code to reflect new design
Merge branch 'master' of github.com:Phalaric/hello-world