.
Merge branch 'master' of https://github.com/catalandres/catalandres.github.io

Conflicts:
	_includes/navbar.html
.
Midterm uploaded