now should be compatible with node 6
tested compatibility with node6
hmmm
maybe
Creating template
Merge branch 'master' of ssh://aosuke-jellycopter.rhcloud.com/~/git/aosuke

Conflicts:
	package.json
	server.js
hum
basic map
oops
primitive display of items
fix the map axis numbering