Merge origin/master

Conflicts:
	public_html/index.html
Merge origin/master

Conflicts:
	public_html/index.html
Merge origin/master