seventh commit
Merge branch 'master' of https://github.com/raymondethan/GS_Prototype
i merge