woop
Merge branch 'master' of github.com:HIPERFIT/vectorprogramming

Conflicts:
	tex/fhpc2013/fhpc2013.tex