Updates to controller and view
merge from master
YOLO
Merge to Master
Merge pull request #4 from Ninjah45/regan

Regan