yoooo
Merge branch 'master' of https://github.com/luolisa/DartCal

Conflicts:
	src/edu/dartmouth/cs/DartCal/DrawView.java