Lab3 now working

Made changes to uppg2 so it does not use std::sort. Uppg4 now fully working.