Regex's Working on all objects with correct messages
Merge branch 'master' of https://github.com/bcamacho1/Capstone_EAP

Conflicts:
	src/main/java/edu/ndnu/capstone/domain/EmergencyType.java