login link after registration
login link after registration
login option after registration, auto coming soon
final registration
lack of extra line fix
Merge branch 'develop' of https://github.com/Team-H/gateway into develop
Merge branch 'develop' of https://github.com/Team-H/gateway into develop

Conflicts:
	models/models.py
adding haystack to django

clearing teacher code from profile
removing unused teacher views
basis for minigame question page
js drop down fix
Merge pull request #148 from beccannlittle/develop

user_back initial pixel art
Merge pull request #149 from ChristianMurphy/search

Search
extra line fix
Merge pull request #123 from JoeStratton/develop

Registration login link
scene1 init pixel art (NOT FINISHED) so Brandon can use for game scripts