Reverted to fix breakage
Merge branch 'master' of github.com:POOSDFall2014/FlixBook-FrontEnd