added barcamp image
included styles
fixed merge conflict