change to layout
css
merge conflict sorted OMG ALL BY MYSELF
thomas
merge conflict fix
Merge branch 'master' of http://github.com/hephistocles/Aperio