Merge origin/master

Conflicts:
	PHP/sendMail.php
	contact.html
	js/main.js
Merge origin/master
Merge origin/master

Conflicts:
	js/main.js
Merge origin/master

Conflicts:
	js/main.js
Merge origin/master

Conflicts:
	js/main.js
Merge origin/master

Conflicts:
	css/main.css