Merge pull request #54 from capms/curley

Curley
final changes to modal
Merge branch 'master' into profilepage

mergeing with master
Merge pull request #55 from capms/profilepage

Profilepage
final changes to modal
Merge pull request #56 from capms/profilepage

final changes to modal
added hr bar to the teams page
Some cosmetic changes
Merge remote-tracking branch 'origin' into merge_branch
Merge pull request #57 from capms/last_changes

added hr bar to the teams page
Merge pull request #58 from capms/profilepage

Some cosmetic changes
Some cosmetic changes
Merge branch 'master' into profilepage

Changes to team page
Merge pull request #59 from capms/profilepage

Profilepage
comments
Merge branch 'master' into comments
not sure
Merge pull request #60 from capms/comments

Comments
fixed conflicts
Comments