Merge branch 'master' of github.com:davidpaulrosser/lab

Conflicts:
	public/.htaccess
Merge branch 'master' of github.com:davidpaulrosser/lab

Conflicts:
	public/.htaccess