rename solutions
rename function to correspond with problem label
remove duplicate file.

The result of a very dirty merging of labs.
add correct solutions
remove old lab.
minor fixes and formatting