merge
added about partial
Merge branch 'master' into front-end

Conflicts:
	.gitignore
	public/js/main.js.orig
	public/js/main.min.js.orig