pull 9 parse users
merge

Merge branch 'master' of github.com:jimmyjacobson/swlasvegas2013