project description page created
Merge branch 'beta' of github.com:darrenburns/TeamProject3 into beta
dashboard page without any content
Merge branch 'project-page' of https://github.com/darrenburns/TeamProject3 into beta
Merge branch 'alter-tickets' into beta

Conflicts:
	core/views.py
	templates/dashboard.html