Added feature three
Added feature four
Merge branch 'featurefour' into dev