first commit
Merge branch 'master' of github.com:zanedev/html5-rails-crashcourse

Conflicts:
	.gitignore