added a sample framework
my commits from my branch
Fixed merge conflict