Commit this fuckiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiing shiiiiiiiiiiiiiiiiiiiiiiiiiit!
asdasdasd
asd
Merge branch 'master' of https://github.com/ranger-plugin/trunk

Conflicts:
	.gitignore