Modified calculations to accomodate database's data's format
Merge pull request #7 from prashantchhabra89/feature/powercalcs

Modified calculations to accomodate database's data's format
Test commit. Updates to web app api jar files.
Merge pull request #8 from prashantchhabra89/jQueryFunctions

Added some jQuery functions.
Merge branch 'master' into heatmapper

Conflicts:
	PowerPlanner/war/index.html
Added heatmap proof of concept with interaction.
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