Initial commit
Merge branch 'master' of github.com:jjcm/copperfieldblaine

Conflicts:
	.gitignore
gitignore