Changed a few things
Merge branch 'master' of https://github.com/gudbergur/RhineDocs

Conflicts:
	LRM/lrm.tex