merging changes
merging changes
slight edits to css
merged
fixed merge conflicts
updated gem file, rescinded css changes
merge with master