before merge with styling changes
Merge branch 'founded' of https://github.com/askcs/team-up-web into founded