choices
Merge branch 'master' of https://github.com/Moroj/ProjectAllocation

Conflicts:
	Gemfile