adds bootstrap and user auth through devise
resolve merge conflicts
Merge pull request #2 from jclemans/user_auth

User auth