updates and additions
Merge branch 'Aime-Work'

Conflicts:
	src/templates/Home/home.php
Merge remote-tracking branch 'origin/master'
Tweaked deploy script.
Merge branch 'Estel-Work'