Contructor fix
Merge branch 'master' of github.com:TTK4145-Project/TTK4145-Project