added jquery
added jquery
Added some layout stuff
merged
Merge branch 'Aci'