Updated after Dr. Hindle's reply
Merge branch 'master' of https://github.com/aghoneim0/CMPUT-410-Winter-2014
Updated after Dr. Hindle's reply