added AWS and figaro and paperclip config --> to upload pictures for the flats
solved conflicts
Merge pull request #19 from maximevita/add-welcome-controller

added AWS and figaro and paperclip config --> to upload pictures for the...