Merge pull request #5 from alienlebarge/master

Add address to the website
Merge pull request #6 from alienlebarge/gh-pages

fix some merge probs