Redesigned with systematic design. Still needs work.
Merge branch 'master' of https://github.com/solt87/magis

Conflicts:
	magis.py
Merge branch 'master' of https://github.com/solt87/magis

Trying to solve the problem caused by acidental file deletion.