commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/server/router.js
Merge pull request #21 from ayohaha/hongwon

Hongwon