Added location and picture
Merge branch 'gh-pages' of github.com:johnjohndoe/CodeForFreedom2014 into gh-pages