Merge pull request #1 from bedevere/master

Update me
Merge pull request #3 from bedevere/0.11

0.11
Merge pull request #4 from bedevere/0.12

Merge pull request #6 from bedevere/0.11
Merge pull request #5 from bedevere/0.12

Combat under work
Update weighteffect.py

Adding in the bones of the magic system. No way to call it yet...
Update weighteffect.py
Update weighteffect.py
Update weighteffect.py
Update weighteffect.py
Update weighteffect.py
Merge pull request #7 from bedevere/master

Getting fixed here
Update weighteffect.py
Update weighteffect.py
Merge pull request #10 from Utreekov/master

Added the bones of a magic system and a between the waves command parser
Fixes

Removed breaks from shop module, and added clarifying text.  Messed around with some of the messages to make them more readable.
Merge pull request #11 from bedevere/0.131

0.131