@BerndSchwarzenbacher and @SAplayer Thank you for help!

Well, I haven't contributed anything here. That's just git.
@BerndSchwarzenbacher Could you try git rebase upstream/master && git push -f to fix the git issue?

Ups I messed that up. Seems like it is clean know. Thank you @SAplayer for helping out.

@larz0 Please review.

@BerndSchwarzenbacher @redmunds looks good but is it okay to just use "brackets.io" instead of "brackets.io/index.html"?

@larz0 Yes, "brackets.io" is okay and more flexible.

@BerndSchwarzenbacher "/index.html" should be removed.

@redmunds @larz0 I'm not sure if you get notified if I just commit the change, so just wanted you to know that I changed it yesterday. Thanks for pointing out.

Reassigning @redmunds since it looks like @larz0 has given the ok (please assign back if not)

@BerndSchwarzenbacher To answer your question, no we're not notified when you just commit a change to you branch, so it's best to add a comment to notify us.

Looks good. Thanks. Merging.