initial rails commit
merge conflicts