Update .gitignore
Basic layout
Merge branch 'master' of github.com:MrFriz/MrFriz.github.io

Conflicts:
	css/main.css