Fixing commit fail
Merge branch 'temp'

Conflicts:
	main.h
Fixing up