hello tong
Merge branch 'merge1' of https://github.com/parkjinyoung/2014dbProject.git into merge1