Don't remember what I've changed.
wtf?Merge branch 'master' of http://github.com/sharyari/uppsats

Conflicts:
	rapport/intro.tex