Finished 3.5
Merge branches 'master' and '3.5_exercises'
Finish layout and routes