20141129:test
Merge branch 'master' of github.com:takekentw/sinatra_projects

Conflicts:
	.gitignore