added omniauth gem
deleted fixtures
omniauth before changes made
Using file comparison to identify that uid was missing in the authentication model - now working
changes commited prior to merge
Merge branch 'users' of https://github.com/PatGW/crowd into users
Remove duplication from playlists
updated conflicting migrations and removed fixtures for testing
Merge branch 'users' of https://github.com/PatGW/crowd into users
added playlist model and migration
all actions added to playlist controller
Fix omniauth error on no credentials supplied
Merge branch 'users' of digital_learner_gh:PatGW/crowd into users
playlist routing added and appropriate controllers
playlist routing added and appropriate controllers
Add facebook OAuth integration
Merge branch 'users' of digital_learner_gh:PatGW/crowd into users
all merge conflicts resolved
Merge branch 'testplaylist' of https://github.com/PatGW/crowd into testplaylist