mint config
Merge branch 'master' of github.com:nelewis/noodle

Conflicts:
	Gemfile
	Gemfile.lock