Remove pyc
Ignore log.txt
Merge branch 'master' of github.com:SimonEbner/cob_web

Conflicts:
	cob_webportal/common/src/robotcontrold/.gitignore