update
Merge branch 'master' of https://github.com/wtchou712/Caesar-is-fun

Conflicts:
	Full Calendar/fullcalendar-1.6.4/demos/myCalenderDivir.js
update