maj dangerous
Merged two branches and added .gitignore