とりあえず動いたバージョン
Merge branch 'master' of
https://github.com/tenkoro614/StarrySkyLetter.git

Conflicts:
	runaway/src/jp/co/yahoo/hackday10/runaway/MainActivity.java
	runaway/src/jp/co/yahoo/hackday10/runaway/TimerActivity.java