Deleted a swp file that was annoying me.
Merge branch 'master' of https://github.com/Lambwatt/Global2014

Because peoples were working at the same time on the same thing.
changed to using images