cleaned up in the controller
changes
solved merge confllict
Merge branch 'develop' of github.com:liampcollins/liannardo into develop