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

Conflicts:
	.gitignore
広告挿入
Merge pull request #4 from mashio08/master

広告挿入