no changes, just merging
nothing
Merge pull request #26 from lrakhman/landing_page

Landing page, lana said okay
Merge branch 'master' of https://github.com/lrakhman/fit-fight
moved font placement in sessions/new
Initial d3 charts
fixed application.css file and application.js file
added compile
added line to config file
precompile
changed typo on views/challenges/index
add rspec floundering
what a bunch of crap
add more merge stuff
changed users_controller
Merge branch 'master' of https://github.com/lrakhman/fit-fight into rspec-work
added method in user model to get recent workouts
added forgery thing to controller
Merge branch 'master' of https://github.com/lrakhman/fit-fight into rspec-work
work on adding graphs