fix merge conflict in git ignore
fundraiser javascript validation tests