edit css - unimportant
Merge branch 'master' of https://github.com/TeamDULCY2/TeamProject

Conflicts:
	Web-Track-Team-Project/Web-Track-Team-Project.v12.suo
	Web-Track-Team-Project/WebProject/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
unimportant
Merge branch 'master' of https://github.com/TeamDULCY2/TeamProject

Conflicts:
	Web-Track-Team-Project/WebProject/styles/templet.css