fixed log ignore file ending
fixing merge conflict on gitignore
fixing gitignore
added files from base branch, manual merge
Updated readme with installation
fixed readme formatting issue
added new directory called Templates and moved the base template to it