Deploy
Merge branch 'master' of https://github.com/ArmandGrillet/Armand.gr

Conflicts:
	.gitignore