Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	public_html/css/main.css
	public_html/html/about.html