login and signup modals working
merged in master
sign up and login working
Chris Initial Commit
Resolves Merge Conflict