updating fixtures
Basic routes
Merge remote-tracking branch 'upstream/master'