migrating and adding iron router
Merge branch 'master' of https://github.com/gwongz/discover_meteor_tutorial

Conflicts:
	.meteor/packages
	.meteor/versions
	client/layout.html
	client/main.html
	packages/.gitignore
	smart.json
	smart.lock
merge
merge