Documents
git ignore
Merge branch 'master' of http://www.github.com/faixalg/clubify

Conflicts:
	.gitignore
	Clubify.csproj
	Controllers/ClubifyController.cs
	Scripts/App/Clubify/clubify.viewModel.js
	Views/Clubify/Index.cshtml
Merge conflicts resolved