did some stuff
Merge branch 'master' of github.com:tommaton/battlehack
tweaked home and product pages
fixed conflicts