styling finished
rag
Merge branch 'linas'
Merge branch 'linas'
login buttons
php working I thhink...
working
slide
Merge remote-tracking branch 'linas/master' into experimental

Conflicts:
	header.php
premerge
Merge branch 'experimental'