Tmp files, etc
Merge branch 'master' of https://github.com/gbergwer/Asjemenao

Conflicts:
	body/nao.py~
upload