initial
Merge branch 'master' of https://github.com/rahulpedduri/scoop

Conflicts:
	.gitignore