Merge pull request #1 from Nashoba-Robotics/test

Remove .DS_Store file
Add states for changing states