first
Merge branch 'master' of https://github.com/Rilliano/osc3-wp

Conflicts:
	.gitignore