Fixed conflict
With teams!
Merge branch 'master' of github.com:pikesley/sweepstaker

Conflicts:
	lib/views/index.haml