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

Conflicts:
	tex/tfp2013/tfp2013.tex