yaruemon 0.0.1

sinatra installed
haml installed
yaruemon 0.0.2

pushの練習
Merge branch 'master' of github.com:otukutun/sinatra_app into otukutun

Conflicts:
	myapp.rb
	views/index.haml
out put random character meigen
Merge branch 'master' of github.com:otukutun/sinatra_app into otukutun

Conflicts:
	views/index.haml
Merge branch 'otukutun'

Conflicts:
	views/index.haml
redirect to video or character
Merge branch 'master' of github.com:otukutun/sinatra_app into otukutun
Merge branch 'otukutun'

Conflicts:
	views/index.haml
完成版
swpファイルdeleted