Merging MacBuild into Master
Merge branch 'master' of https://github.com/ashokfernandez/Solar-Farm-Calculator

Conflicts:
	MacBuild/CompileForMac.sh
	MacBuild/setup.py
	main.py