add merge
Merge branch 'master' of https://github.com/lrakhman/fit-fight into css-jquery-updates
fix css to make everything not terribly screwed up
Merge pull request #34 from lrakhman/css-jquery-updates

Css jquery updates