bs
Merge branch 'kodyOptimization' of https://github.com/bradRougeau/Snapgram into kodyOptimization

Conflicts:
	test/performance_tests/FeedTest.js