Merge branch 'mattias'
Added code to lab5

Now all the code is commented away. Every function is also commented away.
Merge branch 'master' into mattias

Conflicts:
	lab5/lab5/String.h