added main style
rails up running
Merge branch 'minor'