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.
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 branch 'master' of github.com:Automattic/_s

Conflicts:
	404.php
	functions.php
	style.css

Signed-off-by: M.Satrya <satryabima24@gmail.com>