migration, seeder, faker
Merge branch 'master' of https://github.com/raymondchandra/ilu

Conflicts:
	app/models/Order.php
	app/models/Transaction.php