No need for this OSX hidden file
Merge branch 'master' of https://github.com/chartl/Markit

Conflicts:
	iphone_app/WeatherStarter/.DS_Store
Remove OSX hidden file
Merge branch 'master' of https://github.com/chartl/Markit