inicial commit 2014
clean repo
Merge branch 'origin/edicion2014' into 'gh-pages'

Conflicts:
	.gitignore