first commit.
Merge branch 'master' of github.com:okayamarb/middleman-typescript

Conflicts:
	.gitignore