Mucked up with changing the file type of the licence.
Merge remote-tracking branch 'AlbertronKili/master'