TIY-Q3-ROR-CHS/Team1 — pull request #20 by rphuber (2014-09-18 16:11:48+00:00)
Title: Fixes main.scss

Removes missed merge conflict info from main.scss