another commit
firstchange
HAHAHAHA
more changes
Some new stuffMerge branch 'master' of https://github.com/fidsteve/DAT6-git-lab into NEWFUNCBRANCH_MKAY