Added settings section to design in sprint 2
Merge branch 'master' of github.com:Thalmann/swf613-rapport