just uploading
Merge branch 'master' of https://github.com/SweetLynnC/OSS2014Plants