updated model from db, need this committed so I can pull
Merge branch 'master' of https://github.com/MrExpendable/PixelJunkie
Merge branch 'master' of https://github.com/MrExpendable/PixelJunkie