reformated result.tpl, added stuff to company domain, cleaned up main.py
Merge branch 'master' of https://github.com/BassT/lingProject

Conflicts:
	main.py