A few tweaks and file input
Merge branch 'master' of https://github.com/thepoynt/cs362

Conflicts:
	Lab 3/main.cpp
	Lab 3/testfile