Some Controller code added
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/main.cpp