view.py
Merge branch 'master' of github.com:juanplopes/pyrex

Conflicts:
	view.py
removing bench.py