added files I forgot to commit earlier
just a bit of cleaning
small changes to .gitignore to ignore the virtual env and to remove unecessary file
adding uncommited changes before trying to merge add_masonry branch
solved merging conflicts