pulling big rich's new changes
pullin b rich's gravis
routes for days til the upvote, need update studentpoints
Merge pull request #17 from jojo89/routes_and_etc

Routes and etc