initial commit - rails new
merge