Last file got messed up too.
Merge branch 'master' of https://github.com/CP317-2013/LorisPlus