Corrected two typos

"don't" with &apos; should be more correct than &rsquot; (or is it better to escape it \' ?)
I personally find the line * translators: %1$s: smiley */ pretty confusing, but at least it should be singular (not smilies)
Password Inputs

Adds password input types to styles for text and email inputs.
_s: Make sure images with height attributes in comments are scaled
correctly.
Update Theme URL to github

The Theme URL was previously pointing to an old Automattic svn repository that no longer exists. 
This change points the URL back to the main `_s` GitHub repository where it is now being developed on. 
Alternatively it could point to underscores.me
Update Theme URL

The Theme URL was previously pointing to an old Automattic svn repository that no longer exists. This change points the URL to underscores.me which is the site that promotes the theme.
Merge pull request #141 from jkudish/master

Update Theme URL to point to underscores.me. props @jkudish
Remove reference to theme options include in readme.md.
Merge branch 'master', remote-tracking branch 'origin'
Escape dynamic value $nav_id when used as an attribute and html comment. Fixes #146 props @ounziw
Merge pull request #144 from devinsays/master

Remove reference to theme options in the readme. props @devinsays
Merge pull request #84 from pixolin/patch-1

_s: Correct two minor typos in 404.php.
Merge branch 'master', remote-tracking branch 'origin'
_s: Add word breaking to anchors within comment content. Fixes #96.
Merge branch 'master', remote-tracking branch 'origin'
Add basic support for core custom background feature providing fallbacks for WordPress 3.3. Fixes #29
_s: Add basic Infinite Scroll support. Fixes #107. Fixes #105. Props @ethitter.
_s: Minor adjustments to Infinite Scroll's implementation.
Bump version number.
Merge pull request #112 from lukecarbis/patch-1

Add password input types to styles for text and email inputs.
Merge remote-tracking branch 'remotes/underscores/master' into v3-dev

Conflicts:
	404.php
	README.md
	functions.php
	inc/template-tags.php
	style.css