changes for Fall 2014
fixed merge conflict