second initial commit
Merge branch 'master' of github.com:astiam/joanette

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	config/environments/development.rb
	config/initializers/secret_token.rb
	config/initializers/wrap_parameters.rb