Merge branch 'feature-login' of ssh://github.com/darrenburns/TeamProject3
Merge branch 'master' of ssh://github.com/darrenburns/TeamProject3
Merge branch 'master' into gustavo-working
Initial navbar setup - not complete
Initial dashboard work
Create navbar
navbar working with the home page
Fix conflict
Fix script imports
Folder src deleted
Fix models
Initial dashboard layout
Merge branch 'feature-ui' of ssh://github.com/darrenburns/TeamProject3 into feature-ui
Fixed redirect bug after login
Dropdown menu fixed and content related to active tab added
Merge remote-tracking branch 'origin/tom-working' into feature-ui

Conflicts:
	core/migrations/0001_initial.py
	core/models.py
Merge remote-tracking branch 'origin/feature-ui' into beta

Conflicts:
	core/views.py