Merge dropbox version
fix merge conflicts
best working copy
remove everything
remove everything
Merge branch 'master' into github

* master:
  remove everything
  first commit
delete unneeded files