htaccess
Merge pull request #2 from stevei/master

this is a test pull request