Merge branch 'develop'
Merge branch 'develop'
Update Gemfile.lock for Heroku
edit readme
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
delete styles for images
makets.css.scss
change new project link
merge conflict
Merge branch 'develop'
fix makets uniqueness validator message
Missed changes