cosmetics
Merge branch 'master' of https://github.com/hjujah/kladno

Conflicts:
	laravel/app/database/seeds/DatabaseSeeder.php