Actually fix history problem
Merge branch 'master' of github.com:skishore/dropblox