mp2
Merge branch 'master' of https://github.com/redDevilz/randomProject

Conflicts:
	Application.cpp
Merge branch 'master' of https://github.com/redDevilz/randomProject

Conflicts:
	Log.cpp
	Log.h