desktop look for new user

[k-wu01]

added:

• closable notepad with brief instructions
• clickable 'start' button (with hidden log off)
• brush creation icon w/ link to brush creator index
• my brushes icon that opens a window to display user brushes (still need to load in user's brushes)

[nbriz]

@kr1swu i'm a little confused, should i be seeing other stuff on the desktop? i still only get the login screen

[nbriz]

oh i see, new-desktop.html is where the new stuff is at! :)

ok, this looks good to me, but there's going to be a merge conflict with public/desktop/js/main.js, so before u can merge u'll need to click the Resolve conflicts button, that will take u to a page that shows ur code && the rest-api team's code in the same file. in ur case we want to keep both, so simply remove the git merge conflict syntax && then save it. specifically that means after clicking "Resolve conflicts", when u're redirected to the conflicting main.js file, remove this form line 2:

<<<<<<< main

remove this form line 32:

=======

&& this from line 54:

>>>>>>> main

then u should be cleared to press the green Merge pull request button