Akash - initial commit
Merge branch 'master' of https://github.com/akash/secret-santa

Conflicts:
	Gemfile
	Gemfile.lock