add rakefile
add about
merge