merge
Merge branch 'master' of https://github.com/tdjackey/ideahub

Conflicts:
	static/index.html