fixed conflicts with mdipierro master branch
removed a group member at his request
added gitignore