removes merge conflict error on main.scss
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap
Merge pull request #20 from rphuber/bootstrap

Fixes main.scss