commit
Merge branch 'master' of https://github.com/Snowball239/BookStore

Conflicts:
	src/sql/createDatabase.sql