Created two blank test files
merge commit
updated base template
fixed merge issues
commit base template changes
merge commit
fixed merge conflict
merge
Merge pull request #5 from mlee284045/mike

Mike