feature 2 commit 1
changes form patrick

some more changes from patrick
wip
Merge pull request #1 from danielschonfeld/feature2

Feature2