successful jshint
new logo and styles
fix conflict