20141218
Merge branch 'master' of github.com:nicholaslai/my_note