Merge pull request #26 from CapstoneCsMu/master

Pull request
Merge remote-tracking branch 'origin/master'

Conflicts:
	mizzouCareerFair/index.php
Merge remote-tracking branch 'origin/kristi'
added admin account to the database and redirects account to admin page on login
minor fix
ensure admin is logged in to access admin page
Added table for map uploads
Map Update

Committing map update.  There is now a toggle switch to control whether
or not you want to view the map with directions.  After hitting submit
now the inputs disappear and the text directions slide up for better
viewing.  There is also a search again button so that we can hide the
rest but still allow the user to search without reloading theirselves
Merge branch 'mattMergeMapUpdates'

Conflicts:
	mizzouCareerFair/database/NEWdb.sql
	mizzouCareerFair/tigerlogin.php
	mizzouCareerFair/tigerspop.php
adding qr code
edit qr code
fixed issue with tigerpop.php
added admin funtionality to upload map
admin dashboard avalable on index only after admin is logged in
removing original qrcode
Merge remote-tracking branch 'origin/cecilia'
Upload Resume
Cleanup

Cleaned up unneeded files. There also may be some code changes from the
last version. We accidentally made changes without updating to the
newest version first. So if you are missing info, please refer to
previous commits.
adding codescanned.php, added table to careerschema
edit employerView