initial commit
Merge branch 'master' of https://github.com/athanclark/assets

Conflicts:
	.gitignore
	LICENSE
	README.md