Triforce
Merge branch 'master' of github.com:maggy96/python

Some error occured and I think this should fix it.