Merge remote-tracking branch 'origin/master'

Conflicts:

	MadisonVolleyballClub/App_Data/aspnet-MadisonVolleyballClub-20141102042908-1.mdf

	MadisonVolleyballClub/App_Data/aspnet-MadisonVolleyballClub-20141102042908-1_log.ldf
	MadisonVolleyballClub/MadisonVolleyballClub.csproj.user
	MadisonVolleyballClub/bin/MadisonVolleyballClub.dll
	MadisonVolleyballClub/bin/MadisonVolleyballClub.pdb
	MadisonVolleyballClub/obj/Debug/MadisonVolleyballClub.dll
	MadisonVolleyballClub/obj/Debug/MadisonVolleyballClub.pdb