commit canvis
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.php
	style.css