merge
merge
Merge branch 'master' of https://github.com/alex0x08/paster

Conflicts:
	.gitignore
	uberPaste/.idea/workspace.xml