Change
Merge branch 'master' of https://github.com/Group503/SystemConcept-Formal

d9c.

Conflicts:
	src/group503/SystemConcept.java

Conflicts:
	src/group503/SystemConcept.java