Merge pull request #8 from jghezzi/jasons_branch

changes to sitter controller and views
minor fixes