changed dir settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dockerfile
Merge branch 'master' of https://github.com/clholzin/clholzin-dassian_node_v1

Conflicts:
	Dockerfile