pushing things
Merge branch 'master' of https://github.com/cwardzala/magentotest

Conflicts:
	.gitignore