use this
Merge branch 'master' of https://github.com/ksolkowski/calendary

Conflicts:
	Gemfilefdsa