code has been ran through codepro
Merge pull request #138 from winglam/master

code has been ran through codepro
Finalizing the tests and also fixing up some minor details in the main
project.
Update .gitignore
Merge pull request #2 from ZooTypers/master

update