outroController added
Merge branch 'master' of https://github.com/karolmajta/squirrel

Conflicts:
	main.py