init commit
Merge branch 'master' of https://github.com/marteloge/Compendium-TDT4237