proov
lisasin
Merge branch 'master' of https://github.com/krisseliine/KrisseKirstiprojekt

Conflicts:
	Untitled.py