syncing production with master
adding error page and hiding team info for new users
add validation for birthday
adding password page and nfl edits
syncing
fixing after rename
merging
Merge branch 'master' into production

Conflicts:
	loading.html