touch necessary files
Merge branch 'master' into dev
write basic initialisation stuff