Added configuration file
Merge Commit _ I fucked up