added a paper to traits
Merge branch 'master' of https://github.com/SweetLynnC/OSS2014Plants
Moved all the trait lit I had to server