porting from mattharrington/buildcamp/monday
Merge branch 'master' of https://github.com/node-crash-course/introduction

Conflicts:
	.DS_Store