commit to pull code
fix conflict
add change information function
Merge branch 'master' of github.com:huynt57/bluebee.com