Initial commit
Added emacs temp files to .gitignore

Merge branch 'master' of github.com:dwilkins/magentoy

Conflicts:
	.gitignore