idk what this is
Merge branch 'master' of https://github.com/adrian20038/homepage

Conflicts:
	style.css
moved files, so now the new page is the main page