bookkeeping 수정 작업 중...
index.html 충돌해결함.

Merge branch 'master' of github.com:subicura/bb-ng

# By subicura
# Via Chungsub Kim (1) and subicura (1)
* 'master' of github.com:subicura/bb-ng:
  fix ngmin bug
  index.html 수정
  fixing..
  fixing..
  remove unnecessary css
  fix build setting

Conflicts:
	app/index.html
Bookkeeping 수정하기
timeline.js 와 timeline.html 충동 해결함.

Merge commit '3c77f0427531855ea02fb0ce9d4c62221c84fe9b'

# By Jaehue Jang
# Via Chungsub Kim (1) and Jaehue Jang (1)
* commit '3c77f0427531855ea02fb0ce9d4c62221c84fe9b':
  코드 어색한 부분 보정
  calendar page 구현(1차 스케치 수준)
  bookkeeping의 like 기능 처리 rest api 변경
  bookkeeping에 like/dislike 기능 추가

Conflicts:
	app/scripts/controllers/app/group/timeline.js
	app/views/app/group/timeline.html
Merge pull request #14 from rorlab/master

bookkeeping 수정하기