trying to fix a bug with devise
still debugging
bugs are many
fucking bugs
small config fix
hack hack
Merge branch 'master' of github.com:rohan-mehta/Kronos
Merge branch 'master' of github.com:rohan-mehta/Kronos
Merge branch 'master' of github.com:rohan-mehta/Kronos
Fixed merge conflict