Added list of conventions
Merge remote-tracking branch 'saivann/dev' into txes

Conflicts:
	en/developer-guide.md
Added a few more tweaks to the conventions primer.
Reviewed my own diff and discovered a few mistakes.  Now corrected.
Add scrollbar for low resolution screens
Merge remote-tracking branch 'saivann/dev' into tweaks

Conflicts:
	en/developer-guide.md
Workaround for GitHub not displaying markdown in HTML block elements (fixes #10)
(HTML comments are now used, and replaced by mdhtml.rb when building the website)
Fix inaccuracies about bits/target
Improve style for code blocks
Disable makeEditable feature temporarily
Merge remote-tracking branch 'saivann/dev' into tweaks

Conflicts:
	en/developer-guide.md
bits must match current network difficulty
Drop mention of bits in the hash field
Merge pull request #12 from saivann/target

Fix inaccuracies about bits/target
Minor additions and corrections
Removed eliding from RPC command arguments per suggestion by Saivann.
Merge remote-tracking branch 'saivann/dev' into tweaks
Merge pull request #11 from harding/tweaks

Added a conventions guide to the top
Move convention guide inside the div block
Add notoc attribute to the convention guide