-
Merge branch 'master' of https://github.com/rodriguesmarcos/diegoramos.info

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log
Slider compelto
Merge branch 'master' of github.com:rdiego26/diegoramos.info