updated features from production
added htaccess gitignore
removed .htaccess from repo
resolved merge
Merge branch 'master' of github.com:tidrif/psychojellyfish