custom log in
branching working
message owners sudo-tied to branching
fixed merge conflicts
rm'd functionality.js
cleaned up pre style merge
merged accounts
usernames and logins working