Lots of changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
	main.exe
	observer.cpp
	observer.exe
	observer.h
	subject.cpp