initial commit
Merge branch 'master' of https://github.com/alvaroserrano/alvaroserrano.github.io
Merge conflicts resolved
Conflicts:
	Rakefile
	_config.yml

e Please enter the commit message for your changes. Lines starting