Creating template
Merge branch 'master' of ssh://latinomap-samuelmoraes.rhcloud.com/~/git/latinomap

Conflicts:
	README.md
	package.json