added first feature
Merge branch 'feature-first_bits_of_stuff' into develop

* feature-first_bits_of_stuff:
  added first feature