taken out some uneeded lines I added earlier
reverting some dumb changes i made early on
these files were added by me, but are not actually needed
Merge pull request #4 from celesteh/master

Getting rid of junk