added paris
added paris
Merge branch 'master' of https://github.com/olyfaunt/git-mania

added paris