tag changes
Merge branch 'master' of https://github.com/ahcchin/codepathGroupProject

Conflicts:
	GroupProject/GroupProject/Base.lproj/Main.storyboard
	GroupProject/GroupProject/HomeViewController.swift