fixy srixy
Merge branch 'master' of github.com:randwsw/asanti

Conflicts:
	css/borders/galleryborders.css
	gallery.php