Yeah
Merge branch 'master' of https://github.com/friskydingo/goteams

Conflicts:
	Website/js/vis.js