Merge remote-tracking branch 'upstream/master'
updating .htaccess file
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from stevenmccord/master

.htaccess updates