Changed sessions to conferences
Merge branch 'master' of github.com:tddawson/conference-tracker
Merge branch 'master' of github.com:tddawson/conference-tracker

Conflicts:
	tracker/views.py