added htaccess
Merge branch 'master' of github.com:gevvvvv/Tumo-Workshop-Sherlock
Fixed merge conflict