project update after stalling
whooargh
Merge branch 'master' of https://github.com/rhomoelle/portfolio

Conflicts:
	ambroggio.sublime-workspace