CleanUp
Merge branch 'dev' of github.com:spolu/breach into dev

Conflicts:
	package.json
Merge branch 'master' of github.com:spolu/breach into dev

Conflicts:
	package.json
Merge pull request #8 from spolu/dev

Review: Cleanup