merge to storm branch
added gitignore