Added files
Merge branch 'master' of https://github.com/phenotype2/Puma-Themes-Mastermind

Conflicts:
	.gitignore