travis test
nodemodule ignore
Merge branch 'master' of https://github.com/darul75/satelize

Conflicts:
	.gitignore