Rebase 후 Commit 합니다.

https://github.com/GDG-Korea/gdg_codelab_1403/pull/34#issuecomment-37718957

Signed-off-by: Yo Sub Lee <horid121@netkiller.com>