\o/
Merge branch 'master' of github.com:FGRibreau/droplr-backup

Conflicts:
	.gitignore
	README.md