installed rails and generate controller
Merge remote-tracking branch 'origin/master'
WIP: merged github