Adding base routes to controller
Merge remote-tracking branch 'origin/master'
Merging Jessica's changes into Indigo's file structure