PERO LIKE IT'S TIME TO ADD AN EVENT HOMES
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/uscb/cs/cs185/LiftLog2/AddEventDialog.java
add dates and times and events yumyumz