This Is The End (Let's Hope)

its beautiful isnt it?
apparently it wasnt the end, this should be
Merge branch 'master' of https://github.com/gsakis/330project

Conflicts:
	QueueManager.java