added data in the db for the last week
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/sql/insert_data.sql