fiery-skippers-2014/Festifind — pull request #12 by drewfwest (2014-04-18 06:13:02+00:00)
Title: Conflict resolved twitter feed

Hey @manubete fixed the index file for a merge conflict. Looks good to merge with master! Go ahead and accept it!