add files
add readme
remove readme
Merge remote-tracking branch 'upstream/jellybean'