Commit inicial
Merge origin/master

Conflicts:
	.gitignore
	web/index.html
Merge origin/master

Conflicts:
	.gitignore
	web/index.html
Merge origin/master

Conflicts:
	.gitignore
	web/index.html
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/project.properties
	src/java/SessionBeans/PostFacade.java
	web/index.html
Merge origin/master

Conflicts:
	src/java/SessionBeans/PostFacade.java