test
test
Merge branch 'master' of https://github.com/rgrusz01/sp2-cw1-2014

Conflicts:
	.gitignore
	HomeWorkOne/src/one/CourseWork.java
	bin/one/CourseWork.class