initial commit
Merge branch 'master' of https://github.com/dangilf/Ruby-on-Rails

Conflicts:
	README.md
initial commit