small fixes
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Merge branch 'master' of https://github.com/Zpiritual/fluxx
small fixes
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Small fixes
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Merge branch 'master' of https://github.com/Zpiritual/fluxx
Merge branch 'master' of https://github.com/Zpiritual/fluxx
small fixes
Small fixes
Merge branch 'master' of https://github.com/Zpiritual/fluxx