assignment 2 1/27/2014
Merge branch 'master' into gh-pages