lev - before pull
gemfile.lock
invite_each
Merge branch 'master' of https://github.com/ypodo/prototype

Conflicts:
	Gemfile.lock