stuff
merge conflict
fixed bug in ramble creation
Merge pull request #72 from dheckman/master

fixed bug in ramble creation