Added helpers
Add line to put the users routes below for easy merge
Merge remote-tracking branch 'upstream/master'