changed look of site
Merge branch 'master' of https://github.com/tubacoopa/Senior_Project

Conflicts:
	Site_App/__pycache__/urls.cpython-33.pyc
	Site_App/__pycache__/views.cpython-33.pyc
	Site_App/templates/navtest.html