Some HTML
Merge remote-tracking branch 'origin/master'
Some HTML
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/about.html
Syntax Error