Git makes me want to pull my hair out
Merge branch 'master' of https://github.com/elliotanderson13/booksmart1

Conflicts:
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json