Merge branch 'master' of https://github.com/RJFryman/nodemon
Merge branch 'master' of https://github.com/RJFryman/nodemon
Merge branch 'master' of https://github.com/RJFryman/nodemon
leaderboard set up, should be ready to level up pets from activity create
activity data is now successfully sending to db via ajax
Merge branch 'master' of https://github.com/RJFryman/nodemon into user-activity

Gonna resolve these issues now.  Hooray.
merged and conflict resolve with origin master
minor modifications to the activities model
Merge pull request #15 from RJFryman/leaderboard

Leaderboard
Merge pull request #16 from RJFryman/user-activity

Activities New Page Now Sends Data via Ajax
fix conflicts