Merge branch 'DavidNg_Local'
modify startup.py and fix authentication
Merge branch 'master' of https://github.com/davidNHK/OU_Final_Year

Conflicts:
	ou_fyp/fixtures/startup.py
Saving Function

Saving Successful
Merge branch 'master' into DavidNg_Local