Merge branch 'master' of https://github.com/gabrielalmeida/3d_multilayer_viewer

Conflicts:
	README.md
Merge branch 'master' of https://github.com/gabrielalmeida/3d_multilayer_viewer

Conflicts:
	README.md