added finishing touches to magic.py
added finishing touches to magic.py
added some tests for magic.py
fixed bugs in magic.py
finished magic.py and corresponding tests
commiting all changes to magic.py and corresponding codes for final commit
resolved trivial merge conflict