rails stuff
Merge branch 'master' of github.com:scottmsims/mrktplce
fixin stuff