Merge origin/master

Conflicts:
	public_html/index.html
	public_html/js/index.js
Merge origin/master

Conflicts:
	public_html/index.html
	public_html/js/index.js
Merge origin/master
Merge origin/master

Conflicts:
	public_html/index.html
	public_html/js/index.js