Modify .htaccess for localhost and server
Merge branch 'master' of github.com:TheBnk/rojo