Removed white space from company position type
Merge pull request #17 from CapstoneCsMu/ryan

Login Update
Merge branch 'master' into stephen
Merge branch 'master' of https://github.com/CapstoneCsMu/MizzouCareerFairApp
Merge remote-tracking branch 'origin/ryan'
Merge remote-tracking branch 'origin/ryan'
Merge remote-tracking branch 'origin/ryan'
Merge remote-tracking branch 'origin/ryan'
Fix for Stupid Babbage Server

don't use short tags cuz our Babbage server doesn't allow them.
About Us

aboutUs.php shows our linkedIn accounts. If someone could edit the CSS
for it, it doesn't look good on an iphone 4S that would be cool.
CSS Edit1

beauty upgrade
Conflict Resolve

Conflict Resolve