change the navigation and user authentication
change the navigation and user authentication
Removing all thing oldest files
Removing three_js
Merge branch 'master' of https://github.com/davidNHK/OU_Final_Year

Conflicts:
	ou_fyp/templates/WritablePanel.html
Merge branch 'DavidNg_Local'
New Ignore
Merge branch 'DavidNg_Local'
Merge branch 'master' into DavidNg_Local