Sean Li 4061544976 Merge branch 'master' into sean-polish ... Conflicts: src/NewContainer.react.js src/Setup.react.js src/SetupStore.js		2015-02-16 13:42:23 -08:00
..
main.js	Merge branch 'master' into sean-polish	2015-02-16 13:42:23 -08:00