Revert "Added methods"

This reverts commit 1dc8b2eb68df573f08baa93881408e7192443a6a.
Revert "Corrected error"

This reverts commit 9d46bc23657ea28795477156f0d471d0f2f42bb5.
Sorted out git problem
commit
Merge branch 'master' of https://github.com/lulemurfan/ecm2414_cwk

Conflicts:
	prog/package.bluej

	new file:   prog/BlackPebble.class
	new file:   prog/BlackPebble.ctxt
	new file:   prog/BlackPebble.java
	new file:   prog/Pebble.class
	new file:   prog/Pebble.ctxt
	new file:   prog/Pebble.java
	new file:   prog/WhitePebble.class
	new file:   prog/WhitePebble.ctxt
	new file:   prog/WhitePebble.java
	modified:   prog/package.bluej