Merge branch 'marroquim-master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
more links to workshop page
registration links
correcao link registration
minor corrections
Delete workshop.html
Delete workshopPt.html
try to commit
Merge branch 'gh-pages' of https://github.com/EMAp/RHR-2014 into gh-pages

Conflicts:
	workshop.html
	workshopPt.html
mais logos
galeria2
Merge remote-tracking branch 'origin/master'

Conflicts:
	workshop.html