BuildStuffConference/BuildStuff.Mobile — pull request #7 by thefringeninja (2014-09-07 15:38:02+00:00)
Title: removed merge conflict junk

Somehow it got in here :(