Style updates
resolve conflicts

resolve conflicts
Resolved Conflicts

Resolved Conflicts with ellis.js, ellis.scss, and ellis.css