moved files
moved files
updated UI
Merge branch 'master' of github.com:jimjh/315-project