readded everything
Merge branch 'master' of https://github.com/suhsungwoo/CE2