please stop it. (.sdf files) commit it, then you have a conflict, resolve by "using theirs" and we will have to worry muuuch less, please :'(
--> if no conflict - do not commit that thing!
Merge branch 'master' of https://github.com/justia02/PSI-team-3

Conflicts:
	PSI Team 3/PSI Team 3.sdf