added nbproject to the gitignore and added a test folder
merges