Tribex/RapidS — pull request #15 by Nateowami (2013-12-20 06:52:30+00:00)
Title: Manual merge

I created a file and then deleted it and it's causing problems. Don't know if you know how to merge manually? The main changes are docs in 3 classes.