proper waitOn and loading
Merge branch 'master' of github.com:nickthesing/cluster

Conflicts:
	cluster.js
	templates/chat.html
Merge branch 'master' of github.com:nickthesing/cluster

Conflicts:
	cluster.js
	templates/chat.html
new file structure
Merge branch 'master' of github.com:nickthesing/cluster

Conflicts:
	cluster.js