some changes
Merge branch 'master' of github.com:webonise/ror-geekhours