init
Merge branch 'master' of github.com:yakxxx/dropstack

Conflicts:
	.gitignore