Squashed commit of the following:

commit 4b3e3c4d0566e4c23792254c586de0d745b3145a
Author: k-miyamoto <gitmiyamoto@gmail.com>
Date:   Fri May 30 02:19:19 2014 +0900

    miyamoto commit 3

commit 38890ba0e440a0ad4b0b8fa9f5993f8af89868cb
Author: k-miyamoto <gitmiyamoto@gmail.com>
Date:   Fri May 30 02:17:38 2014 +0900

    miyamoto commit 2

commit 0d8a6693b851d9e61ce166b2c04923045157d3ad
Author: gumiichigopine <mtsdnsh@matsuda-no-MacBook-Pro.local>
Date:   Thu May 29 23:05:20 2014 +0900

    Conflicts:
    	readme.txt