Merge pull request #50 from olerem/testing
authorAdrian Chadd <adrian.chadd@gmail.com>
Fri, 4 Apr 2014 10:36:24 +0000 (03:36 -0700)
committerAdrian Chadd <adrian.chadd@gmail.com>
Fri, 4 Apr 2014 10:36:24 +0000 (03:36 -0700)
testing: collection of different changes


Trivial merge