new files for part2
Merge branch 'master' of github.com:6170-fa13/tromba_proj1
working state with user selection