Added info about site
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/main/about.html
Added info about site