style changes

less objects
Merge branch 'master' of https://github.com/Macmee/bestMapAppNA

Conflicts:
	.DS_Store