Add James as local team member
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
Add a cfp for Derby
fixed email typo
Merge pull request #3 from Darkflib/patch-1

fixed email typo
Merge pull request #1377 from bridgetkromhout/master

Moving Bangalore to 2015
Merge branch 'master' of https://github.com/jedi4ever/devopsdays-webby
Merge branch 'master' of github.com:damacus/devopsdays-webby
Merge pull request #1378 from damacus/master

Add proposals to Derby!
moving to google for domains
[ljubljana 2015] initial
Merge pull request #1379 from extraordinaire/2015-ljubljana

[ljubljana 2015] initial
[ljubljana 2015] accommodation booking link
[ljubljana 2015] replace home image
Merge pull request #1380 from extraordinaire/2015-ljubljana

[2015 ljubljana] accommodation link & home image
initial commit for Paris 2015
remove lj, add paris image
fix copypasta errors
fix nits
Merge pull request #1381 from phrawzty/master

initial commit for Paris 2015