Jamaal's commit
Merge branch 'master' of https://github.com/samheather/SeprDSA

Conflicts:
	SeprDSA/src/SeprDSA.java