Adding images to assets/images folder, also checking to see if my database.yml file is finally getting ignored but not gitignored
Merge branch 'master' of https://github.com/stankud/planetary_defense