working on scanning qr code
Merge remote-tracking branch 'origin/master'

Conflicts:
	mizzouCareerFair/database/NEWdb.sql