nothing
fix conflict
Merge branch 'master' of github.com:Derikulous/adventure_time
add new alert
Merge branch 'master' of github.com:Derikulous/adventure_time
attempt to add default devise values