.
Merge branch 'master' of github.com:hellocreep/bored
Signed-off-by: liwen <hellocreep@gmail.com>