Commit #1
Merge branch 'master' of https://github.com/varunrau/wolfram

Conflicts:
	wolfram.py