chages
Merge branch 'master' of https://github.com/NathanExpl0sion/fromluciana