First commit for icebox.
Merge branch 'master' of github.com:aybabtme/icebox

Conflicts:
	.gitignore