merge temp
Merge branch 'ray' of github.com:RayKwon/gistcamp into ray