not sure why this is showing as a new commit
Merge branch 'master' of https://github.com/Morrolan/PastebinAPI

Conflicts:
	setup.py
Changed author info.