Removed the .idea folder
Merge branch 'master' of github.com:macyk/WeatherOnMars

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml