commit
settledMerge branch 'master' of github.com:luolisa/DartCal

Conflicts:
	bin/DartCal.apk
	bin/classes.dex
	bin/classes/edu/dartmouth/cs/DartCal/MainActivity$1.class
	bin/classes/edu/dartmouth/cs/DartCal/MainActivity.class
	bin/classes/edu/dartmouth/cs/DartCal/MyTabsListener.class
	bin/classes/edu/dartmouth/cs/DartCal/R$id.class
	bin/classes/edu/dartmouth/cs/DartCal/WeeklyFragment.class
	bin/resources.ap_