Fixed some stuff... I think...
Merge branch 'master' of github.com:legobear154/MyTown

Conflicts:
	src/main/java/mytown/entities/Resident.java
Fixed conflict