writing user edit page
fixed permit error
deleted merge conflicts
editing a user profile works
Merge pull request #10 from lrakhman/sessions

Sessions
Add path to edit daily workout form
merged from master
profile page renders
Add Enter a Workout functionality
Merge pull request #11 from lrakhman/enter_workout

Enter workout
add show page for challenges, correction of challenge model
correct merge conflict
user profile page made
fixed merge conflicts
add initial test for controller, add initial layout for challenge view
edit challenge to have user_points and challenge_points
Merge pull request #12 from lrakhman/sessions

Sessions
merge changes with master
added stats link in challenges page
added stats link in challenges page