Merge pull request #1 from mikefresh/gh-pages

Give me the master
fine
Revert "fine"

This reverts commit 4012881a998ddf04d72f329ded3b43b89fe43aae.
Template file ready for full build
Template is actually ready to go this time
Merge pull request #14 from anderoy/gh-pages

Ready for build out
Fix conflicts