in progress
fixed htaccess merge conflict
Merge branch 'master' into zach
style changes