Now tests work to again
Merge branch 'master' of https://github.com/Catsquotl/shifting-shifts-on-googlecal

Conflicts:
	lib/cal.rb