initial commit
Merge branch 'master' of github.com:eabraham/MarketingAid

Conflicts:
	.gitignore