Final commit

Final commit. Assignment is finished (due in 30 minutes hehe)