Added random method
Fixed merge conflict
Added random method
Merge branch 'controller' into development
Merge branch 'development' of github.com:jonathanporras/spctrl into development