some work
Merge branch 'master' of https://github.com/marcel141/SAN_ISZeleznice

Conflicts:
	ISZeleznice/ISZeleznice/Controllers/HomeController.cs