added activation
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/db.sqlite3