import initial
première version !
viewport scaling
typo
Merge branch 'master' of github.com:andreivolt/simplon.co

Conflicts:
	Gemfile
	Gemfile.lock
	Guardfile
	app.rb
	config.ru
	views/index.haml