changed n to 40
Merge branch 'master' of github.com:makeready/dramatic

Conflicts:
	app/models/user.rb