adding the defaults
Merge branch 'master' of github.com:ZehCnaS34/Pstack

Conflicts:
	.gitignore