Merge branch 'master' of https://github.com/shingtime/PROJECT1

Conflicts:
plot1.R