Merge pull request #32 from CapstoneCsMu/ceciliaV2

Cecilia v2
Merge pull request #33 from CapstoneCsMu/ceciliaV2

Adding folder "uploads"
Merge pull request #34 from CapstoneCsMu/ceciliaV2

Added Success and Failure View and LDAP authentication
adding test employerView
editing NEWbd.sql
testing queries
Handled case of existing file upload
working on scanning qr code
Merge remote-tracking branch 'origin/master'

Conflicts:
	mizzouCareerFair/database/NEWdb.sql
Student load
changes to student load
laskdjf
stylizing print out
Fixed maps

Maps needed to be resized, rezoomed, repositioned, etc. jQuery Mobile
was playing nice with the maps. Also added functionality to fair
selection and the ability to open the maps with your own app on a phone.
Map Fixed Again

So there was a problem with the time it took to load our page and fire
the javascript and the time it took to call to Google's Server. I found
that if I called to Google's server, and moved the script to the bottom
of the <body> then it allowed enough time to grab the javascript files
from Google's API.
Added functionality to add additional career fairs. Still needs styling as well as updating/deleteing an rss feed
Merge branch 'master' of https://github.com/CapstoneCsMu/MizzouCareerFairApp
adding IP login for qr app
corrected inconsitencies between our database and our sql file
Merge branch 'master' of https://github.com/CapstoneCsMu/MizzouCareerFairApp

Conflicts:
	mizzouCareerFair/database/NEWdb.sql