Changing to version 2
Merge branch 'master' of https://github.com/daniel-almeida/daniel-almeida.github.io

Conflicts:
	css/main.css
	favicon.ico
	index.html