Fixed glossary
Merge branch 'master' of github.com:knutesten/tdt4900_documentation

Conflicts:
	main.tex
Review of prototypeing is done