Add username on login #3
Merge branches 'master' and 'seb_3'
Add uniqueness email and username #5
Merge branches 'master' and 'seb_5'
Added Kaminari on articles index #2
added kaminari #2
Adding devise_helper for modifying devise_error_messages
Merge branches 'master' and 'seb_x'
Added kaminari on Categories #2
Merge branch 'kaminari'
update login via twitter/linkedin
Add environment varibales for API keys
Merge branch 'master' of https://github.com/C404/rails-blog into facebook
add environment varibales for API keys