Git is dumb. Why did we choose to use Git.
I broke a bunch of stuff trying to get Git to calm down. It is aptly named.
FUCK YOU GIT
Merge branch 'matt'
Resolved conflict in Person
Merge remote-tracking branch 'origin/matt'

Conflicts:
	.classpath
	WebContent/header.jsp
	WebContent/index.jsp
	src/edu/uts/sep/model/Person.java
did shit
more shit