shit

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/Observer

Conflicts:
	ObserverC++/Observer.sdf
	ObserverC++/Observer.v11.suo
	ObserverC++/Observer/ConcreteNewsListener.cpp
	ObserverC++/Observer/ConcreteNewsListener.h
	ObserverC++/Observer/Debug/CL.read.1.tlog
	ObserverC++/Observer/Debug/CL.write.1.tlog
	ObserverC++/Observer/Debug/Observer.lastbuildstate
	ObserverC++/Observer/Debug/Observer.log
	ObserverC++/Observer/Debug/Observer.pch
	ObserverC++/Observer/Debug/cl.command.1.tlog
	ObserverC++/Observer/Debug/stdafx.obj
	ObserverC++/Observer/Debug/vc110.idb
	ObserverC++/Observer/Debug/vc110.pdb
	ObserverC++/Observer/NewsListenerInterface.cpp
	ObserverC++/Observer/NewsServer.cpp
	ObserverC++/Observer/Observer.cpp

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
don't know anymore

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>