added gitignore
merge with remote
merge with master