added new feature
added few lines
Merge branch 'master' of https://github.com/brixton/sampleapp into newfeature