Small changes to main.cpp in lab3

The main function is now cleaned up, calling the function printline that, besides printing a line, also prints out the number of the task that is beeing run.
Small additions
Additions to lab3

Added forwardsort (upp2).
Added code to lab5

Added (empty) functions to String.h. Not working currently.
Merge branch 'master' into mattias

Conflicts:
	lab5/lab5/String.h
Some changes to lab3.h
Fixed merge conflict
Merge branch 'master' into mattias

Conflicts:
	lab2/lab2/main.cpp
Merge branch 'mattias' of https://github.com/Drotth/DA170A-labs into mattias

Conflicts:
	lab5/lab5/String.h
Merge branch 'mattias' of https://github.com/Drotth/DA170A-labs into mattias
Lab3 almost ready

Uppgift 2 and 3a now also working. Uppgift 4 is still remaining.
Merge branch 'master' into mattias
Merge branch 'mattias'