week 6
Merge branch 'master' of https://github.com/illepic/aipdx-wdim268-2014