Agent and Promoter create Contract templates for negotiations
Merge branch 'master' of https://github.com/elliotanderson13/booksmart1

Conflicts:
	app/config/database.php