added capacity plan
modified gitignore
merge