Testing views for erc
Merge branch 'master' of https://github.com/marziolek/cracow-ocr-app

Conflicts:
	dev