First Commit
Updated .gitignore
Small tweeks to html templates
Merge branch 'newbranch'

Conflicts:
	.gitignore