timeline 삭제 안됨 해결.
Merge branch 'master' of https://github.com/gnuvill/gnuvillnet

Conflicts:
	timeline/index.php