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.