Revert "Revert 5eca3bc..a249ecf"

Conflicts:
	FitTogether/FitTogether/CreateTeamViewController.swift
	FitTogether/FitTogether/TabBarController.swift
	FitTogether/FitTogether/TeamData.swift
	FitTogether/FitTogether/TeamDataViewController.swift
	FitTogether/fittogethertwo.xcodeproj/project.pbxproj
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
	FrontEnd/Dashboard/Dashboard/Dashboard/dashboardViewController.swift
	FrontEnd/Dashboard/Dashboard/Dashboard/profileViewController.swift