Oct071814
Merge branch 'master' of https://github.com/aircrsq/CSCI310