CS2014/USM — pull request #10 by RossKinsella (2014-03-31 02:58:18+00:00)
Title: Ross

@kevinbluett

I pulled master into the branch and resolved the conflicts.
Does that mean others don't have to deal with conflicts?

Also: You'll need to delete your database.