fix conflicx
no se
fixing conflicts
removing tmp assets
Merge pull request #14 from railsrumble/designfix

fix conflicx