Merge branch 'jeff' of https://github.com/Oob/InternshipMatch into tom

Conflicts:
	controllers/profile.py
	models/db.py

added more sets for fields in tables
stop tracking
no message
pre pop data file is finished. Populates all tables with some data including needed auth tables. added set for states for company table
merge with master