.htaccess and .gitignore
Merge branch 'master' of github.com:malmostad/intranet-forum