fixing backend, broke up couple things, but they should be fixable
Merge branch 'master' of github.com:wikirosterTeam/minimumCrayon