first quiz commit
Merged templating into master branch
Resolved merge conflict with gh-pages branch
Deleted files from root level