Fluff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/app.php
	composer.json
Added migrations, seeds and completed article admin basics
More stuff