David smells (apparently)
Merge branch 'master' of https://github.com/samheather/SeprDSA.git

Conflicts:
	SeprDSA/src/SeprDSA.java