updated up through Spring 2014 class
whitespace was set to tabs. Is now four spaces
Merge pull request #2 from kgilbert-cmu/master

Updated up through Spring 2014 class