Merge branch 'master' into working
Merge branch 'working'
Merge branch 'gh-pages'
Initial Commit Week 2

Much of iOS coding completed
Merge branch 'master' into gh-pages