mike: added legends and  changed colors
Merge branch 'master' of github.com:jimjh/315-project
Merge branch 'master' of github.com:jimjh/315-project