hophhop
restructuration
Merge branch 'master' of https://github.com/will421/VM

Conflicts:
	chaikin/chaikin.py
	haar/haar.py
chaikin2???