sebastian trying to get to "best working files"
Merge branch 'master' of github.com:SJBertsch/Team5Project

Conflicts:
	Case_Compile2.cpp