continuing (sry looks like copy paste, but will customize after) layout
Merge branch 'master' of https://github.com/Frank15/frank15.github.io

Conflicts:
	css/style.css
stupid merging confused me, readd files