Merge pull request #14 from alazenby/master

Just some minor CSS changes
Changed Annie's page titles.
Merge pull request #15 from ghuitster/master

Changed Annie's page titles
Made some stylistic changes and fixed a link.
Changed a few buttons.
Merge pull request #16 from ghuitster/master

Few changes
Changed pages to have more unified color schemes.
Merge pull request #17 from ghuitster/master

Color unifying changes
team form started
Changed Annie's CSS file.
Merge pull request #18 from ghuitster/master

Simple CSS changes
changes from david
Merge remote-tracking branch 'upstream/master'