Merge branch 'master' of https://github.com/amihatt/AssignmentNo7

Conflicts:
	RingBuffer.java