stuff
Merge branch 'master' of https://github.com/yamanickill/reddit-flair-apps

Conflicts:
	assets/js/dependencies/sails.io.js