Merge pull request #8 from Oob/master

pulling before the push
Update default.py

controller update for company/candidate
Update candidate.html
Update company.html
Merge branch 'justins'