Merge pull request #54 from kudos-web/master

Update branch
Updated feature button
Merge pull request #56 from kudos-web/Roy

Update feature button and updated branch