Changes
Merge branch 'devel' of https://github.com/joseaplwork/PersonalWeb into devel

Conflicts:
	js/main.js