Added trusty branch
Merge branch 'saucy' into trusty

Conflicts:
	debian/changelog
Merge pull request #6 from thecodeassassin/trusty

Trusty
Merge branch 'saucy' into trusty

Conflicts:
	debian/changelog
Merge branch 'raring' into trusty

Conflicts:
	debian/changelog
Corrected changelog
Merge branch 'trusty' into lucid

Conflicts:
	debian/changelog