ryanseddon/font-dragr — pull request #5 by maljub01 (2013-05-28 13:41:35+00:00)
Title: main.css had git merge conflict markers

Removed the markers, and got rid of the lines that were supposed to go when the conflict happened.