Jess Changes
Merge https://github.com/Jessica-L/CSCI3155_Fall2014 into JessChanges
pulled and merged changes from gitHub