added splash page with working wheel
resolved merge conflicts
error in rails
fixed rails error