[category, lookbook]
Merge branch 'master' of https://github.com/StephanusJeffry/frunk

Conflicts:
	app/storage/logs/laravel.log
	app/storage/views/14a793130e09d9ec3ca7c620bfd7aed2
	app/storage/views/79d0ca0bfb2a6c9a037fe259d87d8014
	app/storage/views/ecdc9772674e320eb6ce9c56e37f4cc6