Major changes
Merge branch 'master' of https://github.com/The-WebOps-Club/project-management-portal

Conflicts:
	sqlite3