fix typo for Template's log helper
Merge pull request #1496 from qminhdo/patch-1

fix typo for Template's log helper
Update inflection in getting started guide

The static markup says "2 todos left", whereas the dynamic property
was getting set to "item" or "items".
Merge pull request #1497 from kytrinyx/todo-inflection

Update inflection in getting started guide
Added a new user Garagesocial
Merge pull request #1501 from garagesocial/master

Added a new user Garagesocial
Intro prototype extension in relevant section of computed properties

Seems like it makes some sense to introduce the non-extended
computed property declaration here.  Would have been wonderful to have
this extra information when I was going through the guide.
Merge pull request #1502 from rondale-sc/computed_properties_guide

Intro prototype extension in relevant section of computed properties guide
Correct freenode server address
Merge pull request #1503 from mfeckie/patch-3

Correct freenode server address
Added Sush.io
Merge pull request #1505 from oakho/sushio

Added Sush.io
Use this.controller instead of this.controllerFor
Merge pull request #1510 from bmac/this-controller

Use this.controller instead of this.controllerFor
Merge remote-tracking branch 'base/master'

Conflicts:
	source/guides/getting-started/displaying-the-number-of-incomplete-todos.md
	source/guides/object-model/computed-properties.md