updated htaccess
fixing for merge
Merge branch 'master' of https://github.com/ColinWaddell/tapsaff
Merge branch 'master' of https://github.com/ColinWaddell/tapsaff