projekt.prop
Merge branch 'Dev' of github.com:Jonate/Dat255-CrayCray into Dev
Merge branch 'Dev' of github.com:Jonate/Dat255-CrayCray into Dev
forgot which branch i was in. no actual changes
Merge branch 'Dev' of github.com:Jonate/Dat255-CrayCray into Dev