pc6.cpp
 pc6
Merge branch 'master' of github.com:rickshere/CSCI-21-SPRING-2014

Conflicts:
	pc6