added tabs
Merge branch 'master' of https://github.com/AEgan/MySports-475
before refactor pull
Merge branch 'varun' of https://github.com/AEgan/MySports-475
Merge branch 'master' of https://github.com/AEgan/MySports-475

Conflicts:
	public/assets/js/index.js
Merge branch 'master' of https://github.com/AEgan/MySports-475
filters working, cleaned up js a little