added a bunch of files and restructured the code a bit... lots of unfinished stuff in here right now...
updated main
Merge branch 'master' of github.com:davidgross/cptr355-assn9

Conflicts:
	main.cpp
New main file