Week 1 Changes

Additional Entries
Week 1 Changes

Additional Changes
Merge branch 'master' of https://github.com/AnnaKolla/Kolla075-sims2014

Conflicts:

w01_h05_Xenos/Xenos.xcodeproj/project.xcworkspace/xcuserdata/AnnelieKoll
er.xcuserdatad/UserInterfaceState.xcuserstate