attempting to push to trigger necessary merge.
merged changes from mferraro & mferraro

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

Conflicts:
	rosalba.md