a
Merge branch 'master' of https://github.com/imacnu/landing1

Conflicts:
	.gitignore