a lot of changes
Merge branch 'master' of https://github.com/mykytamorachov/overoffers
Много изменений
Merge branch 'master' of https://github.com/mykytamorachov/overoffers
Merge branch 'master' of https://github.com/mykytamorachov/overoffers
Merge branch 'master' of https://github.com/mykytamorachov/overoffers
too many changes
Merge branch 'master' of https://github.com/mykytamorachov/overoffers

Conflicts:
	templates/offers/list.html
	templates/offers/show.html
Too many changes