weird merge stuff
Revert 78cf64a..69e3ca8

This rolls back to commit 78cf64a39c8738db5920ee24f8e2f768dfc18d2c.
Merge branch 'stayFrosty' into Developer-Branch
storyboard stuff
stuff
Revert f9bc47c..0823ae4

This rolls back to commit f9bc47cec405aec463d54c6753ac55defc250be6.
Merge branch 'stayFrosty' into Developer-Branch
teammates now come from cloud kit, phone name
Merge branch 'Developer-Branch' into stayFrosty