ch5 complete
Merge branch 'master' of https://github.com/sammychl/thinkster-example

Conflicts:
	Gruntfile.js