Removed .idea (RubyMine project) files
Merge branch 'master' of https://github.com/Maricek/programovani

Conflicts:
	.idea/workspace.xml