cleaned up!

deleted the extra templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/js/scripts.js