fixed my plot locations
merged conflicts
Merge branch 'master' of github.com:jimjh/315-project