added some lines.
Merge branch 'master' of https://github.com/gustavatmel/twic-twac-twoe

Conflicts:
	main.py