refactored back end
Merge branch 'master' of github.com:alexreinking/YHack2014
Merge branch 'master' of github.com:alexreinking/YHack2014