Think I managed to merge the conflicted files?
Merge branch 'master' of https://github.com/merus/SEP

Conflicts:
	.classpath
	WebContent/header.jsp
	WebContent/index.jsp
	src/edu/uts/sep/model/Person.java
Bet this doesn't work.