My first attempt
My first attempt
My first attempt
Merge branch 'master' of https://github.com/WhiteboardWillis/471project1

Conflicts:
	471project1.sdf
	Debug/471project1.exe
	Debug/471project1.ilk
	Debug/471project1.log
	Debug/471project1.pdb
	Debug/Source.obj
	Debug/vc110.idb
	Debug/vc110.pdb
	Source.cpp