Renamed file Uppg1b to Uppg1, made some small changes and created a file for Uppg2