Updates todo
Merge branch 'cityadd' into ben_2
Updates about info in the footer
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Updates Amber's footer info, still need Edward's
Merge pull request #27 from ambertunnell/ben_2

Ben 2