Test from laptop
Added htaccess

prevents nasty people from exploring the .git directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html