Just playing with the css
Merge branch 'master' of https://github.com/tbrittoborges/tedx_uod

Conflicts:
	css/style.css