Aerobna ameba
Merge branch 'master' of https://github.com/HrvojeDoesNotSeeSharp/TrainingPlanner

Conflicts:
	TrainingPlanner/Controllers/HomeController.cs