Initial commit :
.gitignore added
fix conflict
Merge branch 'master' of github.com:hourliert/forum-rmi

Conflicts:
	.gitignore