Second feature commit
Staging fixed
Merge branch 'feature/first' into staging

* feature/first:
  First feature commit
First feature finished