Merged tests and code into one project.
Updated .gitignore