Added some stuff to index
Merge branch 'emilyBranch'