initial commit to rails demo
added welcome controller
merged with origin master