Initial commit
Merge branch 'master' of https://github.com/signal2564/two-toy

Conflicts:
	source/javascripts/some.js.coffee