View and controller classes
Merge pull request #3 from jcsalaza/view_branch

View and controller classes