Photo and Norwegian translation
Merge branch 'master' of http://github.com/TheBB/resume

Conflicts:
	resume.pdf
	resume.tex