Merge pull request #1 from ericdanz/develop

eric's brain stuff, should be okay
Merge pull request #1 from oddbotics/develop

Merge pull request #1 from ericdanz/develop