Stanford-Online/configuration — pull request #8 by stvstnfrd (2014-10-07 23:34:51+00:00)
Title: Remove conflict artifacts

@jrbl

The following check against the repo (post-commit) returns no results.
```
grep -rI '<<<<<<<' .
grep -rI '>>>>>>>' .
```