I'm so sleeppppy that I don't even know what I'm committing
Merge branch 'master' of https://github.com/withlovee/easy

Conflicts:
	app/database/seeds/DatabaseSeeder.php