many changes
Merge branch 'master' of github.com:ulmic/deadline_camp

* 'master' of github.com:ulmic/deadline_camp:
  Update Gemfile

Conflicts:
	Gemfile