ImageOptim some stuff.
Add *.jar to gitignore (to ignore the selenium server jar)
Trying to fix merges