pre merging
Merge branch 'founded' of https://github.com/askcs/team-up-web into founded
Merge branch 'founded' of https://github.com/askcs/team-up-web into founded
cleaned up bootstrap (custom) styling part 1