Init setup
Merge branch 'master' of https://github.com/davidNHK/OU_Final_Year