fixed everything (i hope)
Merge pull request #7 from mike1072/master

Website Version (if all goes well)