my first commit
Merge branch 'master' of github.com:santonil2004/wall

Conflicts:
	.gitignore