Merge pull request #2 from atilafassina/master

add 2014 teaser
add date and place