calendar-dev
no message
no message
no message
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
no message
Merge branch 'master' of https://github.com/link-kut/calendar-dev

# By bluebibi
# Via bluebibi
* 'master' of https://github.com/link-kut/calendar-dev:
  Update README.md
  Update README.md
  Update README.md
  Update README.md
  Update README.md

Conflicts:
	README.md
no message
Update DaoJUnitTest.java
Merge branch 'master' of https://github.com/link-kut/calendar-dev

Conflicts:
	src/main/java/com/mycompany/myapp/dao/CalendarUserDao.java
	src/main/java/com/mycompany/myapp/dao/DaoTest.java
	src/main/java/com/mycompany/myapp/dao/EventDao.java
	src/main/java/com/mycompany/myapp/dao/JdbcCalendarUserDao.java
	src/main/java/com/mycompany/myapp/dao/JdbcEventDao.java
Merge branch 'master' of https://github.com/link-kut/calendar-dev
no message