Merge remote-tracking branch 'upstream/master'
fixd
add rom test to diet
add diet rom