Updating hostname in ansible
Merge branch 'master' of github.com:layla/flippermaps

Conflicts:
	provisioning/flippermaps.yml
Updating example.json, adding server-js stuff