Twiktor changed to search by tags
Merge branch 'master' of https://github.com/SerCeMan/twiktor

Conflicts:
	src/main/java/ru/spbau/twiktor/app/BotHandler.java