factories almost work
Merge branch 'master' of https://github.com/evanroane/wishmaker
made naming more consistant in factories.js