Added exercise
Merge branch 'gh-pages' of github.com:silshack/spring2014 into gh-pages