added dev.rb
added bar.c
Merge branch 'dev'