merge
Merge branch 'master' of https://github.com/elliotanderson13/booksmart1

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php