Merged the changes from Sprint 1 - Dev 1 resource into develop branch.
Changes done directly in Develop branch: Dev1JavaFile1.java
Merge branch 'develop' into Sprint1

Conflicts:
	GitJavaProject1/bin/dev1Package/Dev1JavaFile1.class
	GitJavaProject1/src/dev1Package/Dev1JavaFile1.java

	Develop branch changes committed in Sprint 1 workspace