Admin Page Completed, unconfirmed node added to keep track of unconfirmed users
Finished Admin Panel
Finished Admin Panel
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration

Conflicts:
	.idea/workspace.xml
	cuorewebpage/Views/Admin_View.py
	cuorewebpage/Views/Blog_View.py
	cuorewebpage/Views/Directory_View.py
	cuorewebpage/Views/Profile_View.py
	cuorewebpage/Views/Registration_View.py
	cuorewebpage/__init__.py
	cuorewebpage/templates/Admin.mako
	cuorewebpage/templates/Registration.mako
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration

Conflicts:
	.idea/workspace.xml
	cuorewebpage/Views/Admin_View.py
	cuorewebpage/Views/Blog_View.py
	cuorewebpage/Views/Directory_View.py
	cuorewebpage/Views/Profile_View.py
	cuorewebpage/Views/Registration_View.py
	cuorewebpage/__init__.py
	cuorewebpage/templates/Admin.mako
	cuorewebpage/templates/Registration.mako