schema.rb
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
removing rectangle restriction on uploaded photos
Mergin conflict
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
Merge branch 'master' of https://github.com/BibAlex/bhl_rails
BHL-226