committing to merge
Merge branch 'master' of https://github.com/AEgan/MySports-475

Conflicts:
	public/assets/js/index.js
welcome