Url for maximatch
Merge branch 'master' of https://github.com/MickeyPash/DIM3-Team-Zeta

Conflicts:
	team_zeta_project/team_zeta_project/urls.py
Merge branch 'master' of https://github.com/MickeyPash/DIM3-Team-Zeta
Merge branch 'master' of https://github.com/MickeyPash/DIM3-Team-Zeta
Merge branch 'master' of https://github.com/MickeyPash/DIM3-Team-Zeta
Merge branch 'master' of https://github.com/MickeyPash/DIM3-Team-Zeta