did minor changes
fixed index to include both sets of code and removed conflicts in DS_Store file