push to merge everything before resetting routes and controllers
Merge pull request #61 from blind-squirrel/Sharon

push to merge everything before resetting routes and controllers