Populated git ignore
Readme and config_template...started :)
Resolved merge conflict and setup requirements file