Need to commit my sdf and sln file in order to get the ones commited by Chris
Again had to do that
Merge branch 'master' of github.com:justia02/PSI-team-3

Conflicts:
	PSI Team 3/PSI Team 3.sdf