Merge pull request #11 from brain-murphy/shivaji

Shivaji
Merge branch 'master' of https://github.com/brain-murphy/crowdsurf into shivaji