Initial Commit
first commit ex 1
initial commit
fixed git conflict