fixed merge issue, added normalize.css
Merge branch 'master' of https://github.com/OfirYaron/AOLHack