added two components
Merge branch 'master' of https://github.com/james-bay/first-project

Conflicts:
	package.json
	src/app/index.coffee
	views/app/index.html