Merge branch 'FKMinus1F1' of https://github.com/marteloge/TDT4300
Merge branch 'FKMinus1F1' of https://github.com/marteloge/TDT4300