Re-added all files (???)
Merge branch 'master' of https://github.com/jmeyers91/simple-web-template