all logins broken
a few pages
lots
much styling, some structure and controller work
happiness
happy
much buckeye work
beginning file upload
minor
Merge branch 'dev'

Conflicts:
	app/controllers/BlogController.php
	app/controllers/CompanyController.php
	app/controllers/admin/AdminDashboardController.php
	app/controllers/user/UserController.php
	app/routes.php
	app/views/admin/layouts/default.blade.php
	app/views/site/user/create.blade.php
	app/views/site/user/login.blade.php
nuthin
idunno
Merge branch 'dev'

Conflicts:
	readme.md
routes
Merge branch 'dev' again

Conflicts:
	app/controllers/BlogController.php
	app/routes.php
	app/storage/meta/collections.json
	readme.md
post-merge asset build
all works
bootstrap 3
company to controllers
not much