working
clean up
Merge branch 'master' of https://github.com/joshjdevl/docker-ndnsim

Conflicts:
	Dockerfile