Merge pull request #2 from CapstoneCsMu/master

Large Update
Merge pull request #4 from CapstoneCsMu/ryan

Sorting Companies
Merge remote-tracking branch 'origin/ryan'
Merge pull request #5 from CapstoneCsMu/cecilia

Merge pull request #2 from CapstoneCsMu/master
Merge pull request #6 from CapstoneCsMu/master

Pulling
Added Facebook login button
Created support page
Created some tables and added database fields
Fixed tables

Fixed tables, file would not run because it had errors.
Merge remote-tracking branch 'origin/ryan'
Merge remote-tracking branch 'origin/ryan'
Merge pull request #7 from CapstoneCsMu/cecilia

Merge pull request #6 from CapstoneCsMu/master
Merge pull request #8 from CapstoneCsMu/master

Updating branch Cecilia
updated readme

adding pages to read me
Merge pull request #9 from CapstoneCsMu/master

updated readme
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