Merge pull request #1 from BallStateCBER/development
Merge branch 'development'
Merge branch 'development'