added controlers
merge
Merge branch 'briardes-master'