tcsorcs/trailsapp — pull request #6 by HypnoticSheep (2014-09-03 20:10:20+00:00)
Title: Fixed Merge Issues

Fixed a handful of build issues stemming from merging the code. Also committing R-related files, though I'm not sure they're necessary.