ada
Merge branch 'master' of https://github.com/lastverb/omletkurs

Conflicts:
	simulations/.tkenvrc
raport v2