noSql
noSql2
l
Merge branch 'master' of https://github.com/pisaq/1

Conflicts:
	Gemfile
	config/database.yml