Fixed duplicate ID, sorted into a more sensible order in the cool of the daytime.
Merge branch 'master' of github.com:martasmith/HackTheHood