Added .swp to gitignore
Merge branch 'master' of github.com:knutesten/tdt4900_documentation
Added hci to glossary
Merge branch 'master' of github.com:knutesten/tdt4900_documentation

Conflicts:
	glossary.tex