Merge pull request #10 from CapstoneCsMu/cecilia

Cecilia
added ECS

Adding about ECS to index page.
updated index.php

Added About ECS to index.php
Merge pull request #11 from CapstoneCsMu/adam

added ECS
Revert "added ECS"

This reverts commit 05f9abfcfc644b9929ddea0b1d10ccf02e09b52c.

Conflicts:
	mizzouCareerFair/index.php
Revert "updated index.php"

This reverts commit a3855e3758a581d1c7e7a1c991a1225fc2dd88ba.

Conflicts:
	mizzouCareerFair/index.php
Added aboutECS to index.php
Edit index.php

Fixing bugs
Merge remote-tracking branch 'origin/adam'
update index.php

:(
update index.php

again
Change index.php

Separated Events and Preparation. Added new content to Preparation page.
Left old content in events page incase we want to reuse some.
edit preparation

why wont it work?
edit preparation.

it isnt working.
Merge pull request #12 from CapstoneCsMu/master

Merging Cecilia's branch to Master