Small syntax errors and other things
Merge branch 'master' of https://github.com/WSCU/Reactive-Engine

Conflicts:
	src/Functions.py