Temporary note until the site gets finished
Temporary note until the site gets finished
Merge branch 'master' of https://github.com/alopepeo/alopepeo.github.io

Conflicts:
	index.html
	main.css
Temporary note until the site gets finished

Coming back from a merge conflict