initial commit
.gitignore update
Merge branch 'master' of https://github.com/MerlierR/smswall

Conflicts:
	.gitignore