Fixed some redirects with login
Resolved merge conflict
Fixed up issues with basic event crud
pagination for events
pagination for users/events
test commit
continuing nested form
Merge branch 'workingBranch' of https://github.com/sdford/meetWithFriends into workingBranch
bug fix
Merge branch 'workingBranch' of https://github.com/sdford/meetWithFriends into workingBranch
Merge branch 'cancan' of https://github.com/sdford/meetWithFriends into cancan
nested form stuff and pulled cancan
fixed home screen layout
testing git setup
Merge branch 'workingBranch' of https://github.com/sdford/meetWithFriends into cancan
Some more work on cancan. semi sunctional, but not really.