added inline code blocks for file-names, directories, and module,action, method names to better distinguish between text and code or names that need to be entered in
rename web/views.ex to view.ex as generated in my version

put task list in pre block for now so readable.

fix render
Merge pull request #60 from koctya/master

add code blocks..
Phoenix.Router.start no longer returnd PID. Changed to start router in Application start instead of as a child of the main supervisor.
Merge pull request #61 from mobileoverlord/master

Phoenix.Router.start no longer returns PID. Start router in app start
first pass at the template guide, minus configuring haml
Merge pull request #62 from lancehalvorsen/first-stab-template-guide

First Pass at the Template Guide
add quote block to reflect current master
change this around to match master first, give warning about previous versions second.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	B_adding_pages.md
	D_controllers.md