moving logic to model -- kelly should fix into JSON
Merge branch 'master' of https://github.com/m1ck3y/hackspace