Added more functionality to Controller as well as adding function headers.
FIxed some minor formatting errors
Merge branch 'master' of https://github.com/rbellido/Project
Merge branch 'master' of https://github.com/rbellido/Project