p2 finished
Merge branch 'master' of https://github.com/davidgaskins/326
bugs fixed lab5