css styling and index jade page
sign up controller, create new user factory
Fixing merge
cleaned up file, added styling
trying to manually merge files
Delete layout.jade
trying to add index.jade
Delete create-group.jade
Delete flashcards.jade
Delete groups.jade
Delete index.jade
Delete logIn.jade
Delete signUp.jade
Delete masthead.html
Delete masthead.jade
Delete .DS_Store
Delete .DS_Store
Fixed merges