Minor edits
Merge branch 'master' of https://github.com/FifoFolta/java-project

Conflicts:
	Sandbox1/src/main/java/com/fifo/Fifo.java