Merge branch 'master' of github.com:MAnyKey/ifmo-design

Conflicts:
	src/main/java/ru/ifmo/mq/MessageQueue.java