Added our first commit

Let's hope for no conflicts ;)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/View.jsx
Merge branch 'master' of https://github.com/eteeselink/dwsfh
Merge branch 'master' of https://github.com/eteeselink/dwsfh