initial solution setup
Added a fake test and renamed gitignroe
updated merge conflict in gitIgnore