Henry Oswald ca851589c9 Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex ...

Conflicts:
	package.json

2014-11-27 13:49:16 +00:00

..

filestore

Merge branch 'master' of https://github.com/sharelatex/filestore-sharelatex

2014-11-27 13:49:16 +00:00