fixes merges
gemfiles
adds view stylings
adds gemfiles
fix merge conflicts
Merge pull request #13 from opleban/Matt

Matt
merggeeeeeeee khaaaaan
fixes merge conflicts