complete service 2 and 3
Merge branch 'master' of github.com:tritamntu/assignment403

Conflicts:
	CPE416Assignment/.classpath
	CPE416Assignment/src/booking/TimePoint.java