add temp
add whatever the temp is
initial challenge commit
add fixed index display view
add corrected merge conflicts
add show page for challenges, correction of challenge model
correct merge conflict
add initial test for controller, add initial layout for challenge view
edit challenge to have user_points and challenge_points
merge changes with master
add datetime method to check if a user has entered a daily challenge
Merge branch 'master' of https://github.com/lrakhman/fit-fight into challenge_view
add user methods for recent stats
refactor edit page to ultilize new user methods
add user methods for getting total stats for daily_workouts
add helper methods for point calculations
move user methods for daily_workouts to challenge model
refactor of challenges page, add table to display all workouts associated with challenge
pulling out points calculations
add point calculation on challenge show page and index