fixed 2014 to 2012
fixed merge
Merge branch 'master' of https://github.com/jarjan/sdc-homework