Squashed commit of the following:

commit 3a2f37328fa203f3ceab4f2dc3eb319082d7e43a
Author: dev <dev@localhost.localdomain>
Date:   Wed Mar 12 15:27:39 2014 +0900

    add hij

commit 1c65d9e8d83fc1042d55b84357b6e27594e9aa36
Author: dev <dev@localhost.localdomain>
Date:   Wed Mar 12 15:26:41 2014 +0900

    add efg
add a
Merge branches 'master' and 'new2'