Yo
Merge branch 'master' of https://github.com/jjman505/socialmint

Conflicts:
	collections/collections.js