rebased new folder pull request

I rebased my changes on your current master branch.  Basically, I kept all your files from your master branch and then just added the files in the folder that I've been working in.  Hopefully that will keep me from stepping on your toes.