Fixed changelog
Merge branch 'master' of github.com:rbmj/frc-buildscripts

Conflicts:
	debian/changelog