Inital commit
init
Merge branch 'master' of git@github.com:yinhe/demo_rails.git

Conflicts:
	.gitignore