P1@osk Sat Mar 29 03:57:25 JST 2014
Merge branch 'master' of github.com:Takechiyocn/bash

Conflicts:
	abs_guide/tmp/test.sh
	tricky/test.sh