Bla
Bla
Merge branch 'master' of https://github.com/auliss09/is12-programmeerimise_algkursus

Conflicts:
	numeric_types.py
	string_methods.py
too