tabbed UI
Merge branch 'master' of https://github.com/mvigil90/cs263_project