VIM working files excluded.
Merge branch 'master' of https://github.com/CzechHackathon2013/zoorilla
Merge branch 'master' of https://github.com/CzechHackathon2013/zoorilla

Conflicts:
	.gitignore