adding initial devise configuration
adds basic devise functionality
fixing merge conflicts
Merge branch 'master' into basic_views
Merge branch 'master' into basic_views
Merge pull request #11 from arieldiamond/basic_views

Basic views