Calendar
changed title in HTML
Merge remote-tracking branch 'Josh/master'

Conflicts:
	ycp-cs320-project/src/edu/ycp/CS320/shared/FakeDatabase.java
Merge remote-tracking branch 'choose_remote_name/master'