Commit from homhome
WAT
Merge branch 'master' of github.com:EwanValentine/IsItVegan

Conflicts:
	.htaccess
Messaging shit