Merge pull request #21 from klocey/master

Fixed conflict in figures directory -KL
added macroecology SAD tools from Weecology's Github and KJL's analysis toolbox -KL