Ignore these changes, will be rebased
Merge branch 'master' of https://github.com/chickensouple/teamUp
Merge branch 'master' of https://github.com/chickensouple/teamUp
Merge branch 'master' of https://github.com/chickensouple/teamUp
Control page
merge