gmdj
gmdj
ㅇㅇㅇㅇ
ㅇㅇㅇㅇ
Merge remote-tracking branch 'remotes/origin/jungmin' into youngjae
Merge remote-tracking branch 'remotes/origin/ben' into youngjae

Conflicts:
	app/common/auth.js
	app/controllers/api.js
	app/controllers/api/posts.js
	app/controllers/controllers.js
	app/controllers/posts.js
	app/views/layout.hbs
	app/views/posts/list.hbs
	public/js/collections/posts.js
	public/js/lib/backbone-min.js
Merge remote-tracking branch 'remotes/origin/ben' into youngjae

Conflicts:
	app/common/auth.js
	app/controllers/api.js
	app/controllers/api/posts.js
	app/controllers/controllers.js
	app/controllers/posts.js
	app/views/layout.hbs
	app/views/posts/list.hbs
	public/js/collections/posts.js
	public/js/lib/backbone-min.js