init
Merge branch 'master' of https://github.com/arrraichu/gamedev_midterm
added text