Smashing Intro
Merge branch 'master' of https://github.com/emberwatch/emberwatch-source

Conflicts:
	data/people.json
	data/tutorials.json