commiting development log

need to commit log to avoid merge conflict with
master
fixing merger conflict
fixed merge conflict
Merge branch 'master' of https://github.com/ieatkimchi/Bike-1-1