3 Column Test
Merge branch 'master' of https://github.com/Alyar/X

Conflicts:
	index.html
	stylesheet.css