reinitialize
Merge branch 'master' of github.com:Holderness/Canadian-Tuxedo

Conflicts:
	Gemfile
	Gemfile.lock