Images

merge images branch now that everyone has rmagick gem working on their local machines