Merge pull request #11 from prashantchhabra89/heatmapper

Heatmapper
change h5 margin
add all files to repo
i don't what happened... i need to stage again
added 3 picture. also, i'm pushing this to "retina" branch just to test.
Test change for retina branch
Removes Redundant folder
Merge pull request #12 from prashantchhabra89/retina

Retina
Merge remote-tracking branch 'origin/master' into feature/powercalcs
Datastore populator script.
Merge pull request #13 from prashantchhabra89/feature/databasepopulator

Feature/databasepopulator
Included datastore settings file into populator. Updated power calcs to
query from datastore. Updated power calcs to output necessary data to
heat map.
1 Change radio buttons 
2 Change "show" button
3 Change "property" button
4 Change resource title
5 Add images for different resources
End file with newline
Merge branch 'feature/powercalcs' of https://github.com/prashantchhabra89/Alternate-Power-Source-Property-Mapper.git into feature/powercalcs
Resolved merge conflict in Datastore Populator (Solar)
Merge pull request #14 from prashantchhabra89/feature/powercalcs

Power calculations done. Datastore populator almost done.
Merge remote-tracking branch 'origin/master' into retina
Updated Show options with new names for Solar and Hydro power
checkboxes.
Merge pull request #15 from prashantchhabra89/retina

1 Change radio buttons