working on home page animation
Merge branch 'html' of github.com:webonise/ror-geekhours into html
working on home page animation
conflict resolved