Merge branch 'DavidNg_Local'
Merge branch 'DavidNg_Local'
Correct Makefile to Linux
Merge branch 'master' of github.com:davidNHK/OU_Final_Year
Merge branch 'master' into DavidNg_Local