Conflicts:
	Hub.js
	index.html
removing Hub.js again