fix shitty cpu numbers
trying again and stuff
Merge branch 'master' into introduction

Conflicts:
	report/introduction/modern_gpu.tex
typo
Merge pull request #121 from dmpro2014/introduction

fix shitty cpu numbers