added feature1
added feature 2
added additional features
Merge branch 'feature1'
coool merge
mergin' like a baaaaawwwwwwwwwwwwssssssssssss'

Merge branch 'feature2_additional'