Merge pull request #12 from AaronGreenberg/master

newest version
Merge pull request #13 from AaronGreenberg/master

going to check out the new thing
Merge pull request #14 from AaronGreenberg/master

getting the most updated version
small gui change

changing the order of sliders on y/r tab for Daniel
Merge pull request #15 from AaronGreenberg/master

getting the updates from Aaron
gui changes
Merge pull request #19 from dknip/master

more gui updates from danielle