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