blueJ file update
Merge branch 'master' of https://github.com/klgauthier/SummerOfJava

Conflicts:
	package.bluej
Merge branch 'master' of https://github.com/klgauthier/SummerOfJava

Conflicts:
	package.bluej
editted git ignore and package file