napisi nesto
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrainingPlanner.v11.suo
	TrainingPlanner/bin/TrainingPlanner.dll
	TrainingPlanner/bin/TrainingPlanner.pdb
	TrainingPlanner/obj/Debug/TrainingPlanner.dll
	TrainingPlanner/obj/Debug/TrainingPlanner.pdb