Initial commit
Merge branch 'master' of https://github.com/jmoody02/FindawayMagento.git

Conflicts:
	.gitignore