Fixed some styling
Fixed conflict
Merge branch 'master' of https://github.com/knutesten/tdt4900
Cleaned up some code om smileyWeek, refactored, and started working on detailedWeek