initial commit
Merge github.com:mcasper/gemlocker

Conflicts:
	.gitignore