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

# By Chris Bloom
# Via Chris Bloom
* 'master' of https://github.com/illepic/aipdx-wdim268-2014:
  week 7