Added my name as contributor
Merge branch 'fnordsBranch' into develop