project3 stuff
Merge branch 'master' of https://github.com/ThePotatoGuy/comp-projects

Conflicts:
	Project2/Project2.sdf
	Project2/Project2.v11.suo
d shit must be deleted