Changed names
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/src/com/designproject/EquipmentInspectionList.java
	DesignProject/src/com/designproject/InspectionOverview.java
	DesignProject/src/com/designproject/RoomList.java
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/src/com/designproject/FireAlertApplication.java