nothing
Merge branch 'master' of https://github.com/whysoseriousness/pouch_rails
nothing
nothing
Merge branch 'master' of https://github.com/whysoseriousness/pouch_rails

Conflicts:
	db/migrate/20130804012444_create_users.rb