refactored templates out of inline script tags in index.html to seperate template files
Merge branch 'master' into gh-pages, templates put into their own files

Conflicts:
	bundle.js
	index.html