changes made
Merge branch 'Favorites-Group' into shin_local

Conflicts:
	favorites.html
	script.js
temp
Merge branch 'Favorites-Group' into shin_local

Conflicts:
	favorites.html
brushed
Clean files now
Merge branch 'Favorites-Group' into shin_local

Conflicts:
	.DS_Store
cleaned up mess