basis werkend react componentje
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/mrooding/full-stack-javascript-summerclass

Conflicts:
	app/index.html
	app/scripts/app.js
	bower.json

resolved