Added dependancies
Merged files and added to gitignore