ActiveRecord v0.0.4
Merge branch 'master' of https://github.com/3kg4kR/active_record

Conflicts:
	History.md
	README.md
	lib/active_record.js
	lib/associations/associations.js
	lib/base.js
	lib/connection.js
	lib/error.js
	lib/relations/actions.js
	lib/relations/finders_methods.js
	lib/relations/query.js
	lib/transaction.js
	node_modules/.bin/db-migrate
	node_modules/db-migrate/bin/db-migrate
	node_modules/db-migrate/node_modules/.bin/semver
	node_modules/db-migrate/node_modules/moment/package.json
	node_modules/db-migrate/node_modules/moment/readme.md
	node_modules/db-migrate/node_modules/optimist/test/_/bin.js
	node_modules/db-migrate/node_modules/semver/bin/semver
	node_modules/inflections/lib/inflections.js
	node_modules/sqlite3/.npmignore
	node_modules/sqlite3/LICENSE
	node_modules/sqlite3/Makefile
	node_modules/sqlite3/README.md
	node_modules/sqlite3/binding.gyp
	node_modules/sqlite3/configure
	node_modules/sqlite3/lib/sqlite3.js
	node_modules/sqlite3/package.json
	node_modules/sqlite3/src/async.h
	node_modules/sqlite3/src/database.cc
	node_modules/sqlite3/src/database.h
	node_modules/sqlite3/src/macros.h
	node_modules/sqlite3/src/statement.cc
	node_modules/sqlite3/src/statement.h
	node_modules/sqlite3/src/threading.h
	node_modules/sqlite3/test/affected.test.js
	node_modules/sqlite3/test/blob.test.js
	node_modules/sqlite3/test/cache.test.js
	node_modules/sqlite3/test/constants.test.js
	node_modules/sqlite3/test/database_fail.test.js
	node_modules/sqlite3/test/each.test.js
	node_modules/sqlite3/test/exec.test.js
	node_modules/sqlite3/test/extension.test.js
	node_modules/sqlite3/test/map.test.js
	node_modules/sqlite3/test/named_columns.test.js
	node_modules/sqlite3/test/named_params.test.js
	node_modules/sqlite3/test/null_error.test.js
	node_modules/sqlite3/test/open_close.test.js
	node_modules/sqlite3/test/other_objects.test.js
	node_modules/sqlite3/test/parallel_insert.test.js
	node_modules/sqlite3/test/prepare.test.js
	node_modules/sqlite3/test/profile.test.js
	node_modules/sqlite3/test/rerun.test.js
	node_modules/sqlite3/test/scheduling.test.js
	node_modules/sqlite3/test/serialization.test.js
	node_modules/sqlite3/test/support/createdb.js
	node_modules/sqlite3/test/support/helper.js
	node_modules/sqlite3/test/trace.test.js
	node_modules/sqlite3/test/unicode.test.js
	package.json
	tests/index.js