merged project with omrails application