fsdfs
Merge branch 'master' of https://github.com/ShaneBurkhart/CS53HW10

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/ShaneBurkhart/CS53HW10