Styles and slides
Merge branch 'master' of github.com:csexton/angular-rails-presentation

Conflicts:
	slides/04_file_organization.md