Merge branch 'meveridge' of https://github.com/meveridge/douglas into propane
First build of login and user system
updated the User migration to have an admin and regular user
updated the User migration to have an admin and regular user
Merge pull request #4 from TheJaySmith/propane

Propane