Smaller ruby if block
Merge branch 'master' of github.com:International-Space-Apps-Challenge-Tokyo/WhereToPutSolarPanels

Conflicts:
	mongo/aggregate.rb