Add Devise User model
Commit new .gitignore
add metadata
fixed merge errors