asdfasd

debugging problems for brock :)
3.5.2
Merge pull request #19 from TopherJonesy/master

Master