Display calendar
git ignore
gitignore
Merge branch 'master' of github.com:Oxynum/residence_goldwyn

Conflicts:
	Gemfile.lock