compiles but runs to infinity
threading now working. forgot to add in a condition variable
Merge branch 'multithread'

Conflicts:
	main.cpp