commit
Merge remote-tracking branch 'git@github.com_omiend/20141115_casleyconsulting_hackathon.git/master'

Conflicts:
	.gitignore
Merge pull request #3 from aisugita/master

click action complete!
広告挿入
Merge pull request #4 from mashio08/master

広告挿入
Merge branch 'master' of github.com:omiend/20141115_casleyconsulting_hackathon
スタイル