project Add
Merge branch 'master' of https://github.com/JakobSung/HelloRubyOnRails

Conflicts:
	.gitignore