Face-Off/faceoff — pull request #21 by davegw (2014-07-17 02:18:29+00:00)
Title: Clean up merge conflict

Fix merge conflict in previous commit 51487e3d43b97971946c02d2ac109eebc89ad0f8.
https://github.com/Face-Off/faceoff/commit/51487e3d43b97971946c02d2ac109eebc89ad0f8