updated for ged-lab version of repo
Merge branch 'master' of https://github.com/ged-lab/msu-cse491-2013