Merge pull request #3 from alex-heritier/develop

Develop
Merge pull request #4 from alex-heritier/develop

Responsive design
asdf
Merge pull request #5 from alex-heritier/develop

asdf
Merge branch 'master' of https://github.com/alex-heritier/aheritier

Conflicts:
	scripts/script.min.js
Rebasing
Merge branch 'develop' of https://github.com/alex-heritier/aheritier into develop

Conflicts:
	scripts/scripts.min.js