First commit - separated the site and dev folders
Create README.md
first commit
Merge branch 'developer' of https://github.com/nicolastelfer/my-site into developer
Merge branch 'developer' of https://github.com/nicolastelfer/my-site

Conflicts:
	README.md