Adding a test commit
Merge pull request #2 from neocraft/master

Adding a test commit