Added gems for test enviroment and configured gitignore file
Solved conflicts