Debut de la map
Merge branch 'master' of https://github.com/Yoshiji/furry-archer

Conflicts:
	public/stylesheets/style.css
	public/stylesheets/style.less
Ignoring Node modules
Zoom and Init