Merge branch 'master' of https://github.com/katiekatieb/codeunion
Merge branch 'master' of https://github.com/katiekatieb/codeunion
Merge branch 'master' of https://github.com/katiekatieb/codeunion into forms-nav-style
Refine buttons, page titles, colors
Merging solr from master
Styling welcome header
Fixing upvote color arrows
Finish article and page spacing
restored gem files from master
Merge branch 'master' of https://github.com/katiekatieb/codeunion
Merge branch 'master' into forms-nav-style
Restoring foundation icons to Gemfile
Posting working version of icomoon fonts for presentation
Merge pull request #22 from katiekatieb/presentation

Presentation