Merge pull request #4 from Victoria68/master

Merge pull request #3 from Victoria68/falcons
Revert "canvis dia 30-03-2014"

This reverts commit 850c817aece6c0ff36690e1151cb2874ccf5c695.

Conflicts:
	web_1307/web_falcons/_frame/search-white.png
	web_2207/img/historia/figura3_082013.jpg

Signed-off-by: Victoria68 <mvcarrau@gmail.com>
Merge pull request #5 from Victoria68/falcons

Canvis dia 30