company home (temp)
Update controllers/default.py
Create studenthome
Create companyhome
remove this
Merge branch 'justins' of https://github.com/Oob/InternshipMatch into justins
Fixed some redirect bugs, etc with malik
Update views/default/companyhome
Update views/default/studenthome
before presentation additions
Merge branch 'master' of https://github.com/Oob/InternshipMatch into justins
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
Update controllers/default.py

controller update for stu/company home pages
Update views/default/studenthome

student home page
Update views/default/companyhome

company home update
update profile
registration_key fix and a few table additions