renamed variables for clarity
added ds store
Merge branch 'master' into redirect
Merge pull request #61 from massmetrics/redirect

Redirect