lab7-3 removing extra files
Merge branch 'master' of https://github.com/csc456fall2014/calvin-mclain
lab7-4 and lab7-3 removing extra files