updated migration
Merge branch 'master' of https://github.com/kedarv/SecretSanta

Conflicts:
	app/database/migrations/2014_11_21_132908_alter_users.php