lab6
Merge branch 'master' of https://github.com/csc456fall2014/calvin-mclain