Add new styles, add guard gems, update bootstrap
Resolve css conflict
Resolve css conflict (attempt 2)
custom.css.scss edited online with Bitbucket
remove categories
custom.css.scss edited online with Bitbucket
Merged in phetue/filmwin/style-updates (pull request #1)

Style updates
add Phil's categories styles back in to fix weird merge conflict
Merge branch 'master' of bitbucket.org:ryanfreng/filmwin