Squashed commit of the following:

commit 1fc6136aa6de9debd381718b1b75f219ada9b8f6
Author: Jim <dashjim@gmail.com>
Date:   Fri Mar 14 11:13:09 2014 +0800

    merge squash test 2

commit c77dd632ac6c2dbfe935729fd0fc7d064dc0c9fb
Author: Jim <dashjim@gmail.com>
Date:   Fri Mar 14 11:12:57 2014 +0800

    merge squash test 1
Merge branch 'master' of github.com:dashjim/testGit