Added viewer, connected FileChooser
Merge branch 'clayton'
Viewer works with FileChooser