no mo bullshit

:D
Merge branch 'master' of https://github.com/Alyar/X

Conflicts:
	index.html
thesis skeleton 1.0

Started on the thesis version. added some functions. Not styled jet.
Merge branch 'master' of https://github.com/Alyar/X

Conflicts:
	css/style.css
	index.html