Progressing on initial build
Added htaccess to gitignore
Merge branch 'master' into beta