update
Merge branch 'master' of github.com:vuquangchien/techday2014
Merge branch 'master' of github.com:vuquangchien/techday2014
update ws