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