Merge branch 'controller' into mauricio
updating moving developer board view
merging with master
New test and stuff
Merge branch 'controller' into mauricio
pushing board panel developer placement and movement changes
merging with views for board panel updates
Developer test update
Merge branch 'mauricio' into controller
Merge branch 'controller'
Merge branch 'master' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2
Merge branch 'master' into controller