merging conflicts
Conflict resolved
Merge pull request #2 from masi8397/Testing_New_Files

Testing new files