weekview added
Merge branch 'master' of ssh://github.com/anadon/cs3141-calander

Conflicts:
	.cal.db
	src/calander/Control.java