endringer
Removed local eclise files
Merge branch 'master' of https://github.com/tonjeb/Assignment2.git

Conflicts:
	.classpath
	.gitignore